Commit 021d3a72 authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds

[PATCH] knfsd: nfsd4: handling more nfsd_cross_mnt errors in nfsd4 readdir

This patch on its own causes no change in behavior, since nfsd_cross_mnt()
only returns -EAGAIN; but in the future I'd like it to also be able to return
-ETIMEDOUT, so we may as well handle any possible error here.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6899320c
...@@ -1845,15 +1845,11 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, ...@@ -1845,15 +1845,11 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
exp_get(exp); exp_get(exp);
if (d_mountpoint(dentry)) { if (d_mountpoint(dentry)) {
if (nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp)) { int err;
/*
* -EAGAIN is the only error returned from err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
* nfsd_cross_mnt() and it indicates that an if (err) {
* up-call has been initiated to fill in the export nfserr = nfserrno(err);
* options on exp. When the answer comes back,
* this call will be retried.
*/
nfserr = nfserr_dropit;
goto out_put; goto out_put;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment