Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85f8607e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7a8e1dc3

fs/nfs/dir.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -766,10 +766,9 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, 
	desc->page_index = 0;

	desc->page_index = 0;

	desc->page = page;

	desc->page = page;





	if (nfs_readdir_xdr_to_array(desc, page, inode) == -1) {

	status = nfs_readdir_xdr_to_array(desc, page, inode);

		status = -EIO;

	if (status < 0)

		goto out_release;

		goto out_release;

	}





	status = nfs_do_filldir(desc, dirent, filldir);

	status = nfs_do_filldir(desc, dirent, filldir);