diff options
| author | J.Bruce Fields <bfields@fieldses.org> | 2006-10-04 02:16:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 07:55:20 -0700 |
| commit | d0ebd9c0e71d20ea8c2b4a071d2a2b4878ef07d6 (patch) | |
| tree | 703b61a59254506f322894281c35a0b224ae6905 /fs/nfsd | |
| parent | f38b20c64519bb812a49b9ef4e10d90367a5af5c (diff) | |
| download | blackbird-op-linux-d0ebd9c0e71d20ea8c2b4a071d2a2b4878ef07d6.tar.gz blackbird-op-linux-d0ebd9c0e71d20ea8c2b4a071d2a2b4878ef07d6.zip | |
[PATCH] knfsd: nfsd4: clean up exp_pseudoroot
The previous patch enables some minor simplification here.
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>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/export.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index ac5149d25372..597b3cbf8b0b 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -1058,14 +1058,11 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN) return nfserr_dropit; if (exp == NULL) - rv = nfserr_perm; + return nfserr_perm; else if (IS_ERR(exp)) - rv = nfserrno(PTR_ERR(exp)); - else { - rv = fh_compose(fhp, exp, - exp->ex_dentry, NULL); - exp_put(exp); - } + return nfserrno(PTR_ERR(exp)); + rv = fh_compose(fhp, exp, exp->ex_dentry, NULL); + exp_put(exp); return rv; } |
