projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a8e1dc
)
NFS: Fix the error handling in "uncached_readdir()"
author
Trond Myklebust
<Trond.Myklebust@netapp.com>
Sat, 20 Nov 2010 18:24:49 +0000
(13:24 -0500)
committer
Trond Myklebust
<Trond.Myklebust@netapp.com>
Mon, 22 Nov 2010 18:24:46 +0000
(13:24 -0500)
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
patch
|
blob
|
history
diff --git
a/fs/nfs/dir.c
b/fs/nfs/dir.c
index 353f47c31b1d8c7662a08f75082887c700d326f0..2492bacf68a70caf954d60c23c698e810b9808eb 100644
(file)
--- 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);