diff options
author | J.Bruce Fields <bfields@fieldses.org> | 2006-12-13 03:35:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:54 -0500 |
commit | 6899320c2cefe5ae6b606f820ba8b762ba21f34a (patch) | |
tree | a31bc8a2f916643d3f29ed4acf262ab667f491aa | |
parent | 4b41bd85d5f93af37c2730df172aeb54280be7c3 (diff) |
[PATCH] knfsd: nfsd: simplify exp_pseudoroot
Note there's no need for special handling of -EAGAIN here; nfserrno() does
what we want already. So this is a pure cleanup with no change in
functionality.
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>
-rw-r--r-- | fs/nfsd/export.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 0747bb5ffcf1..b0591cd172eb 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c | |||
@@ -1163,12 +1163,10 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, | |||
1163 | mk_fsid_v1(fsidv, 0); | 1163 | mk_fsid_v1(fsidv, 0); |
1164 | 1164 | ||
1165 | exp = exp_find(clp, 1, fsidv, creq); | 1165 | exp = exp_find(clp, 1, fsidv, creq); |
1166 | if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN) | 1166 | if (IS_ERR(exp)) |
1167 | return nfserr_dropit; | 1167 | return nfserrno(PTR_ERR(exp)); |
1168 | if (exp == NULL) | 1168 | if (exp == NULL) |
1169 | return nfserr_perm; | 1169 | return nfserr_perm; |
1170 | else if (IS_ERR(exp)) | ||
1171 | return nfserrno(PTR_ERR(exp)); | ||
1172 | rv = fh_compose(fhp, exp, exp->ex_dentry, NULL); | 1170 | rv = fh_compose(fhp, exp, exp->ex_dentry, NULL); |
1173 | exp_put(exp); | 1171 | exp_put(exp); |
1174 | return rv; | 1172 | return rv; |