From 77586e7c894ef1e063462edb4aed8449f1b29d7a Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 1 Aug 2010 20:14:55 -0400
Subject: [PATCH] --- yaml --- r: 206415 b: refs/heads/master c:
 0d8a374673c9bc62bc78a2d8fe64553a51542cb4 h: refs/heads/master i:   206413:
 9d6d2641472b1d96cb33a97fe9acf1829a47ac57   206411:
 5aac564f9831f384db7f2100cb66d5336e90233a   206407:
 fdd4c509d6addf8ea8ac9329f15b9637818df083   206399:
 38c7e9fc7f2674c9e8c6693938eb538dddcd4afb v: v3

---
 [refs]                               | 2 +-
 trunk/net/sunrpc/auth_gss/auth_gss.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 049a8b15fa3d..717910011d0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3ae62ae08bb0db3639d8c579e4ff0967d908199
+refs/heads/master: 0d8a374673c9bc62bc78a2d8fe64553a51542cb4
diff --git a/trunk/net/sunrpc/auth_gss/auth_gss.c b/trunk/net/sunrpc/auth_gss/auth_gss.c
index 096e1260bc67..dcfc66bab2bb 100644
--- a/trunk/net/sunrpc/auth_gss/auth_gss.c
+++ b/trunk/net/sunrpc/auth_gss/auth_gss.c
@@ -928,6 +928,7 @@ gss_do_free_ctx(struct gss_cl_ctx *ctx)
 {
 	dprintk("RPC:       gss_free_ctx\n");
 
+	gss_delete_sec_context(&ctx->gc_gss_ctx);
 	kfree(ctx->gc_wire_ctx.data);
 	kfree(ctx);
 }
@@ -942,13 +943,7 @@ gss_free_ctx_callback(struct rcu_head *head)
 static void
 gss_free_ctx(struct gss_cl_ctx *ctx)
 {
-	struct gss_ctx *gc_gss_ctx;
-
-	gc_gss_ctx = rcu_dereference(ctx->gc_gss_ctx);
-	rcu_assign_pointer(ctx->gc_gss_ctx, NULL);
 	call_rcu(&ctx->gc_rcu, gss_free_ctx_callback);
-	if (gc_gss_ctx)
-		gss_delete_sec_context(&gc_gss_ctx);
 }
 
 static void