korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFS: Fix missing page_unlock() in nfs_readpage

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2006-11-19 16:44:52 -05:00
parent 0b67130149
commit cf1308ff78
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfs/read.c
View File

@ -145,12 +145,12 @@ static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode,
{ {
unsigned int rsize = NFS_SERVER(inode)->rsize; unsigned int rsize = NFS_SERVER(inode)->rsize;
unsigned int count = PAGE_CACHE_SIZE; unsigned int count = PAGE_CACHE_SIZE;
int result; int result = -ENOMEM;
struct nfs_read_data *rdata; struct nfs_read_data *rdata;
rdata = nfs_readdata_alloc(count); rdata = nfs_readdata_alloc(count);
if (!rdata) if (!rdata)
return -ENOMEM; goto out_unlock;
memset(rdata, 0, sizeof(*rdata)); memset(rdata, 0, sizeof(*rdata));
rdata->flags = (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0); 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,
result = 0; result = 0;
io_error: io_error:
unlock_page(page);
nfs_readdata_free(rdata); nfs_readdata_free(rdata);
out_unlock:
unlock_page(page);
return result; return result;
} }
@ -630,9 +631,10 @@ int nfs_readpage(struct file *file, struct page *page)
goto out_error; goto out_error;
if (file == NULL) { if (file == NULL) {
error = -EBADF;
ctx = nfs_find_open_context(inode, NULL, FMODE_READ); ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
if (ctx == NULL) if (ctx == NULL)
return -EBADF; goto out_error;
} else } else
ctx = get_nfs_open_context((struct nfs_open_context *) ctx = get_nfs_open_context((struct nfs_open_context *)
file->private_data); file->private_data);