aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
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/nfs/dir.c
parent7a8e1dc34f52fd2927dbf7e520d7cd8eadc51336 (diff)
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/nfs/dir.c')
-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 353f47c31b1d..2492bacf68a7 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,
766 desc->page_index = 0; 766 desc->page_index = 0;
767 desc->page = page; 767 desc->page = page;
768 768
769 if (nfs_readdir_xdr_to_array(desc, page, inode) == -1) { 769 status = nfs_readdir_xdr_to_array(desc, page, inode);
770 status = -EIO; 770 if (status < 0)
771 goto out_release; 771 goto out_release;
772 }
773 772
774 status = nfs_do_filldir(desc, dirent, filldir); 773 status = nfs_do_filldir(desc, dirent, filldir);
775 774