aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-11-19 16:44:52 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-06 10:46:27 -0500
commitcf1308ff7829017dab0dbcc817c63dc9c212923e (patch)
tree9ceec966f682c4674ac45d1ef15d52c3a1f9d737 /fs/nfs
parent0b67130149b006628389ff3e8f46be9957af98aa (diff)
NFS: Fix missing page_unlock() in nfs_readpage
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/read.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index e879ee6e1385..29094a545088 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -145,12 +145,12 @@ static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode,
145{ 145{
146 unsigned int rsize = NFS_SERVER(inode)->rsize; 146 unsigned int rsize = NFS_SERVER(inode)->rsize;
147 unsigned int count = PAGE_CACHE_SIZE; 147 unsigned int count = PAGE_CACHE_SIZE;
148 int result; 148 int result = -ENOMEM;
149 struct nfs_read_data *rdata; 149 struct nfs_read_data *rdata;
150 150
151 rdata = nfs_readdata_alloc(count); 151 rdata = nfs_readdata_alloc(count);
152 if (!rdata) 152 if (!rdata)
153 return -ENOMEM; 153 goto out_unlock;
154 154
155 memset(rdata, 0, sizeof(*rdata)); 155 memset(rdata, 0, sizeof(*rdata));
156 rdata->flags = (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0); 156 rdata->flags = (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0);
@@ -218,8 +218,9 @@ static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode,
218 result = 0; 218 result = 0;
219 219
220io_error: 220io_error:
221 unlock_page(page);
222 nfs_readdata_free(rdata); 221 nfs_readdata_free(rdata);
222out_unlock:
223 unlock_page(page);
223 return result; 224 return result;
224} 225}
225 226
@@ -630,9 +631,10 @@ int nfs_readpage(struct file *file, struct page *page)
630 goto out_error; 631 goto out_error;
631 632
632 if (file == NULL) { 633 if (file == NULL) {
634 error = -EBADF;
633 ctx = nfs_find_open_context(inode, NULL, FMODE_READ); 635 ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
634 if (ctx == NULL) 636 if (ctx == NULL)
635 return -EBADF; 637 goto out_error;
636 } else 638 } else
637 ctx = get_nfs_open_context((struct nfs_open_context *) 639 ctx = get_nfs_open_context((struct nfs_open_context *)
638 file->private_data); 640 file->private_data);