aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfsfh.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@puzzle.fieldses.org>2007-07-17 07:04:40 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:07 -0400
commit2d3bb25209c1f9a27ea9535c7fd2f6729a5e7db1 (patch)
tree487ccec9aaf60298d4cb7b2fc5f4d76072bcc60b /fs/nfsd/nfsfh.c
parent47f9940c55c0bdc65188749cae4e841601f513bb (diff)
knfsd: nfsd: make all exp_finding functions return -errno's on err
Currently exp_find(), exp_get_by_name(), and friends, return an export on success, and on failure return: errors -EAGAIN (drop this request pending an upcall) or -ETIMEDOUT (an upcall has timed out), or return NULL, which can mean either that there was a memory allocation failure, or that an export was not found, or that a passed-in export lacks an auth_domain. Many callers seem to assume that NULL means that an export was not found, which may lead to bugs in the case of a memory allocation failure. Modify these functions to distinguish between the two NULL cases by returning either -ENOENT or -ENOMEM. They now never return NULL. We get to simplify some code in the process. We return -ENOENT in the case of a missing auth_domain. This case should probably be removed (or converted to a bug) after confirming that it can never happen. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfsd/nfsfh.c')
-rw-r--r--fs/nfsd/nfsfh.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index ecf9c361b3f5..89f9041a7782 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -160,15 +160,14 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
160 &rqstp->rq_chandle); 160 &rqstp->rq_chandle);
161 } 161 }
162 162
163 if (IS_ERR(exp) && (PTR_ERR(exp) == -EAGAIN 163 error = nfserr_stale;
164 || PTR_ERR(exp) == -ETIMEDOUT)) { 164 if (PTR_ERR(exp) == -ENOENT)
165 error = nfserrno(PTR_ERR(exp));
166 goto out; 165 goto out;
167 }
168 166
169 error = nfserr_stale; 167 if (IS_ERR(exp)) {
170 if (!exp || IS_ERR(exp)) 168 error = nfserrno(PTR_ERR(exp));
171 goto out; 169 goto out;
170 }
172 171
173 /* Check if the request originated from a secure port. */ 172 /* Check if the request originated from a secure port. */
174 error = nfserr_perm; 173 error = nfserr_perm;