diff options
| author | J.Bruce Fields <bfields@fieldses.org> | 2006-12-13 09:35:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 18:05:54 +0100 |
| commit | 6899320c2cefe5ae6b606f820ba8b762ba21f34a (patch) | |
| tree | a31bc8a2f916643d3f29ed4acf262ab667f491aa /fs/nfsd | |
| parent | [PATCH] knfsd: nfsd: make exp_rootfh handle exp_parent errors (diff) | |
| download | linux-6899320c2cefe5ae6b606f820ba8b762ba21f34a.tar.xz linux-6899320c2cefe5ae6b606f820ba8b762ba21f34a.zip | |
[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>
Diffstat (limited to 'fs/nfsd')
| -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, mk_fsid_v1(fsidv, 0); exp = exp_find(clp, 1, fsidv, creq); - if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN) - return nfserr_dropit; + if (IS_ERR(exp)) + return nfserrno(PTR_ERR(exp)); if (exp == NULL) return nfserr_perm; - else if (IS_ERR(exp)) - return nfserrno(PTR_ERR(exp)); rv = fh_compose(fhp, exp, exp->ex_dentry, NULL); exp_put(exp); return rv; |