summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-11-20 13:24:49 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-11-22 13:24:46 -0500
commit85f8607e163f8d281fb407357279cb4ac6df12e6 (patch)
treeabfa44658e17b4c3522aac999c7736f5d4782ff6 /fs
parent7a8e1dc34f52fd2927dbf7e520d7cd8eadc51336 (diff)
downloadlinux-3.10-85f8607e163f8d281fb407357279cb4ac6df12e6.tar.gz
linux-3.10-85f8607e163f8d281fb407357279cb4ac6df12e6.tar.bz2
linux-3.10-85f8607e163f8d281fb407357279cb4ac6df12e6.zip
NFS: Fix the error handling in "uncached_readdir()"
Currently, uncached_readdir() is broken because if fails to handle the results from nfs_readdir_xdr_to_array() correctly. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/dir.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 353f47c31b1..2492bacf68a 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -766,10 +766,9 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
desc->page_index = 0;
desc->page = page;
- if (nfs_readdir_xdr_to_array(desc, page, inode) == -1) {
- status = -EIO;
+ status = nfs_readdir_xdr_to_array(desc, page, inode);
+ if (status < 0)
goto out_release;
- }
status = nfs_do_filldir(desc, dirent, filldir);