Import 2.1.129pre4

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 26d0cb8244edcec3b228c7430f87ad137f3bc466..3f9b160787811a2301aa4d8ad4831c8ec9d2912d 100644 (file)
--- 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)