commit 85f8607e163f8d281fb407357279cb4ac6df12e6
author Trond Myklebust <Trond.Myklebust@netapp.com> Sat Nov 20 13:24:49 2010 -0500
committer Trond Myklebust <Trond.Myklebust@netapp.com> Mon Nov 22 13:24:46 2010 -0500
tree abfa44658e17b4c3522aac999c7736f5d4782ff6
parent 7a8e1dc34f52fd2927dbf7e520d7cd8eadc51336

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>

fs/nfs/dir.c

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 353f47c..2492bac 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -766,10 +766,9 @@
 	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);