Commit d3c10203 authored by Linus Torvalds's avatar Linus Torvalds

Import 2.1.129pre4

parent 5f99a99e
...@@ -225,7 +225,7 @@ nfs_readpage(struct file *file, struct page *page) ...@@ -225,7 +225,7 @@ nfs_readpage(struct file *file, struct page *page)
{ {
struct dentry *dentry = file->f_dentry; struct dentry *dentry = file->f_dentry;
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
int error = -1; int error;
dprintk("NFS: nfs_readpage (%p %ld@%ld)\n", dprintk("NFS: nfs_readpage (%p %ld@%ld)\n",
page, PAGE_SIZE, page->offset); page, PAGE_SIZE, page->offset);
...@@ -242,6 +242,7 @@ nfs_readpage(struct file *file, struct page *page) ...@@ -242,6 +242,7 @@ nfs_readpage(struct file *file, struct page *page)
if (error) if (error)
return error; return error;
error = -1;
atomic_inc(&page->count); atomic_inc(&page->count);
if (!IS_SWAPFILE(inode) && !PageError(page) && if (!IS_SWAPFILE(inode) && !PageError(page) &&
NFS_SERVER(inode)->rsize >= PAGE_SIZE) NFS_SERVER(inode)->rsize >= PAGE_SIZE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment