diff --git a/[refs] b/[refs]
index 86e9fec654ca..774861f52edf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6
+refs/heads/master: 2b2ec7554cf7ec5e4412f89a5af6abe8ce950700
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index 3523b895eb4b..5a97bcfe03e5 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -516,8 +516,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)