[PATCH] knfsd: svcrpc: gss: simplify rsc_parse()

Adopt a simpler convention for gss_mech_put(), to simplify rsc_parse().

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 7 insertions, 11 deletions

diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c
index f8bac6ccd524..d88468d21c37 100644
--- a/net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -224,7 +224,8 @@ EXPORT_SYMBOL(gss_service_to_auth_domain_name);
 void
 gss_mech_put(struct gss_api_mech * gm)
 {
-        module_put(gm->gm_owner);
+        if (gm)
+                module_put(gm->gm_owner);
 }
 
 EXPORT_SYMBOL(gss_mech_put);
@@ -307,8 +308,7 @@ gss_delete_sec_context(struct gss_ctx	**context_handle)
                 (*context_handle)->mech_type->gm_ops
                         ->gss_delete_sec_context((*context_handle)
                                                         ->internal_ctx_id);
-        if ((*context_handle)->mech_type)
-                gss_mech_put((*context_handle)->mech_type);
+        gss_mech_put((*context_handle)->mech_type);
         kfree(*context_handle);
         *context_handle=NULL;
         return GSS_S_COMPLETE;
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index d51e316c5821..71f57a5d800d 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -425,6 +425,7 @@ static int rsc_parse(struct cache_detail *cd,
         struct rsc rsci, *rscp = NULL;
         time_t expiry;
         int status = -EINVAL;
+        struct gss_api_mech *gm = NULL;
 
         memset(&rsci, 0, sizeof(rsci));
         /* context handle */
@@ -453,7 +454,6 @@ static int rsc_parse(struct cache_detail *cd,
                 set_bit(CACHE_NEGATIVE, &rsci.h.flags);
         else {
                 int N, i;
-                struct gss_api_mech *gm;
 
                 /* gid */
                 if (get_int(&mesg, &rsci.cred.cr_gid))
@@ -488,21 +488,17 @@ static int rsc_parse(struct cache_detail *cd,
                 status = -EINVAL;
                 /* mech-specific data: */
                 len = qword_get(&mesg, buf, mlen);
-                if (len < 0) {
-                        gss_mech_put(gm);
+                if (len < 0)
                         goto out;
-                }
                 status = gss_import_sec_context(buf, len, gm, &rsci.mechctx);
-                if (status) {
-                        gss_mech_put(gm);
+                if (status)
                         goto out;
-                }
-                gss_mech_put(gm);
         }
         rsci.h.expiry_time = expiry;
         rscp = rsc_update(&rsci, rscp);
         status = 0;
 out:
+        gss_mech_put(gm);
         rsc_free(&rsci);
         if (rscp)
                 cache_put(&rscp->h, &rsc_cache);