diff options
| author | Trond Myklebust | 2010-08-02 02:14:55 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2010-08-04 14:55:14 +0200 |
| commit | 0d8a374673c9bc62bc78a2d8fe64553a51542cb4 (patch) | |
| tree | b3e5807bc7dd434465327726fdb2f94829cefc86 /net | |
| parent | SUNRPC: prevent task_cleanup running on freed xprt (diff) | |
| download | kernel-qcow2-linux-0d8a374673c9bc62bc78a2d8fe64553a51542cb4.tar.gz kernel-qcow2-linux-0d8a374673c9bc62bc78a2d8fe64553a51542cb4.tar.xz kernel-qcow2-linux-0d8a374673c9bc62bc78a2d8fe64553a51542cb4.zip | |
SUNRPC: Defer deleting the security context until gss_do_free_ctx()
There is no need to delete the gss context separately from the rest
of the security context information, and doing so gives rise to a
an rcu_dereference_check() warning.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 096e1260bc67..dcfc66bab2bb 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/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 |