summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-11-20 13:24:46 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-11-22 13:24:45 -0500
commit7a8e1dc34f52fd2927dbf7e520d7cd8eadc51336 (patch)
treede5e01e628e0fec4a20e335ef5a3163e307ba3fa
parente7c58e974a0318fcca5368e7b3570e10e9ae9028 (diff)
downloadop-kernel-dev-7a8e1dc34f52fd2927dbf7e520d7cd8eadc51336.zip
op-kernel-dev-7a8e1dc34f52fd2927dbf7e520d7cd8eadc51336.tar.gz
NFS: Fix a page leak in uncached_readdir()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/dir.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 42e66e9..353f47c 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -763,13 +763,14 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
goto out;
}
+ desc->page_index = 0;
+ desc->page = page;
+
if (nfs_readdir_xdr_to_array(desc, page, inode) == -1) {
status = -EIO;
goto out_release;
}
- desc->page_index = 0;
- desc->page = page;
status = nfs_do_filldir(desc, dirent, filldir);
out:
OpenPOWER on IntegriCloud