From: Linus Torvalds <torvalds@linuxfoundation.org>
Date: Fri, 23 Nov 2007 20:17:19 +0000 (-0500)
Subject: Import 2.1.129pre4
X-Git-Tag: 2.1.129pre4
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=d3c10203c7db997e4d79a0dd9a54c19cf7c16a24;p=history.git

Import 2.1.129pre4
---

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 26d0cb8244ed..3f9b16078781 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -225,7 +225,7 @@ nfs_readpage(struct file *file, struct page *page)
 {
 	struct dentry *dentry = file->f_dentry;
 	struct inode *inode = dentry->d_inode;
-	int		error = -1;
+	int		error;
 
 	dprintk("NFS: nfs_readpage (%p %ld@%ld)\n",
 		page, PAGE_SIZE, page->offset);
@@ -242,6 +242,7 @@ nfs_readpage(struct file *file, struct page *page)
 	if (error)
 		return error;
 
+	error = -1;
 	atomic_inc(&page->count);
 	if (!IS_SWAPFILE(inode) && !PageError(page) &&
 	    NFS_SERVER(inode)->rsize >= PAGE_SIZE)