提交 1df0cada 编写于 作者: J J. Bruce Fields 提交者: Linus Torvalds

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

Adopt a simpler convention for gss_mech_put(), to simplify rsc_parse().
Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: NNeil Brown <neilb@suse.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 270d56e5
...@@ -224,7 +224,8 @@ EXPORT_SYMBOL(gss_service_to_auth_domain_name); ...@@ -224,7 +224,8 @@ EXPORT_SYMBOL(gss_service_to_auth_domain_name);
void void
gss_mech_put(struct gss_api_mech * gm) 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); EXPORT_SYMBOL(gss_mech_put);
...@@ -307,8 +308,7 @@ gss_delete_sec_context(struct gss_ctx **context_handle) ...@@ -307,8 +308,7 @@ gss_delete_sec_context(struct gss_ctx **context_handle)
(*context_handle)->mech_type->gm_ops (*context_handle)->mech_type->gm_ops
->gss_delete_sec_context((*context_handle) ->gss_delete_sec_context((*context_handle)
->internal_ctx_id); ->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); kfree(*context_handle);
*context_handle=NULL; *context_handle=NULL;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
......
...@@ -425,6 +425,7 @@ static int rsc_parse(struct cache_detail *cd, ...@@ -425,6 +425,7 @@ static int rsc_parse(struct cache_detail *cd,
struct rsc rsci, *rscp = NULL; struct rsc rsci, *rscp = NULL;
time_t expiry; time_t expiry;
int status = -EINVAL; int status = -EINVAL;
struct gss_api_mech *gm = NULL;
memset(&rsci, 0, sizeof(rsci)); memset(&rsci, 0, sizeof(rsci));
/* context handle */ /* context handle */
...@@ -453,7 +454,6 @@ static int rsc_parse(struct cache_detail *cd, ...@@ -453,7 +454,6 @@ static int rsc_parse(struct cache_detail *cd,
set_bit(CACHE_NEGATIVE, &rsci.h.flags); set_bit(CACHE_NEGATIVE, &rsci.h.flags);
else { else {
int N, i; int N, i;
struct gss_api_mech *gm;
/* gid */ /* gid */
if (get_int(&mesg, &rsci.cred.cr_gid)) if (get_int(&mesg, &rsci.cred.cr_gid))
...@@ -488,21 +488,17 @@ static int rsc_parse(struct cache_detail *cd, ...@@ -488,21 +488,17 @@ static int rsc_parse(struct cache_detail *cd,
status = -EINVAL; status = -EINVAL;
/* mech-specific data: */ /* mech-specific data: */
len = qword_get(&mesg, buf, mlen); len = qword_get(&mesg, buf, mlen);
if (len < 0) { if (len < 0)
gss_mech_put(gm);
goto out; goto out;
}
status = gss_import_sec_context(buf, len, gm, &rsci.mechctx); status = gss_import_sec_context(buf, len, gm, &rsci.mechctx);
if (status) { if (status)
gss_mech_put(gm);
goto out; goto out;
}
gss_mech_put(gm);
} }
rsci.h.expiry_time = expiry; rsci.h.expiry_time = expiry;
rscp = rsc_update(&rsci, rscp); rscp = rsc_update(&rsci, rscp);
status = 0; status = 0;
out: out:
gss_mech_put(gm);
rsc_free(&rsci); rsc_free(&rsci);
if (rscp) if (rscp)
cache_put(&rscp->h, &rsc_cache); cache_put(&rscp->h, &rsc_cache);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册