aboutsummaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2008-10-20 16:34:21 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-10-22 14:05:30 -0400
commit30bc4dfd3b64eb1fbefe2c63e30d8fc129273e20 (patch)
tree84e7f997d96aa51c89b166cd0d209c9015f6083d /fs/nfsd
parent6dfcde98a299196f13dd66417663a819f0ac4156 (diff)
nfsd: clean up expkey_parse error cases
We might as well do all of these at the end. Fix up a couple minor style nits while we're there. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/export.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 7ce2c6e4e23..5cd882b8871 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -99,7 +99,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
int fsidtype;
char *ep;
struct svc_expkey key;
- struct svc_expkey *ek;
+ struct svc_expkey *ek = NULL;
if (mesg[mlen-1] != '\n')
return -EINVAL;
@@ -107,7 +107,8 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
err = -ENOMEM;
- if (!buf) goto out;
+ if (!buf)
+ goto out;
err = -EINVAL;
if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
@@ -151,38 +152,34 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
/* now we want a pathname, or empty meaning NEGATIVE */
err = -EINVAL;
- if ((len=qword_get(&mesg, buf, PAGE_SIZE)) < 0) {
- cache_put(&ek->h, &svc_expkey_cache);
+ len = qword_get(&mesg, buf, PAGE_SIZE);
+ if (len < 0)
goto out;
- }
dprintk("Path seems to be <%s>\n", buf);
err = 0;
if (len == 0) {
set_bit(CACHE_NEGATIVE, &key.h.flags);
ek = svc_expkey_update(&key, ek);
- if (ek)
- cache_put(&ek->h, &svc_expkey_cache);
- else err = -ENOMEM;
+ if (!ek)
+ err = -ENOMEM;
} else {
struct nameidata nd;
err = path_lookup(buf, 0, &nd);
- if (err) {
- cache_put(&ek->h, &svc_expkey_cache);
+ if (err)
goto out;
- }
dprintk("Found the path %s\n", buf);
key.ek_path = nd.path;
ek = svc_expkey_update(&key, ek);
- if (ek)
- cache_put(&ek->h, &svc_expkey_cache);
- else
+ if (!ek)
err = -ENOMEM;
path_put(&nd.path);
}
cache_flush();
out:
+ if (ek)
+ cache_put(&ek->h, &svc_expkey_cache);
if (dom)
auth_domain_put(dom);
kfree(buf);