NFS: Fix the return value in nfs_page_mkwrite()

commit 2b2ec7554cf7ec5e4412f89a5af6abe8ce950700 upstream.

Commit c2ec175c39f62949438354f603f4aa170846aabb ("mm: page_mkwrite
change prototype to match fault") exposed a bug in the NFS
implementation of page_mkwrite.  We should be returning 0 on success...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index cec79392e4ba3f1b746166928b073379e2622ab4..f4a5bbbed14f80a7300949d721d980f2c66c6df1 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -480,8 +480,6 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
                goto out_unlock;
 
        ret = nfs_updatepage(filp, page, 0, pagelen);
-       if (ret == 0)
-               ret = pagelen;
 out_unlock:
        unlock_page(page);
        if (ret)