diff --git a/[refs] b/[refs]
index 53818c8c49c6..b8ca10438c20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a
+refs/heads/master: 7fdf523067666b0eaff330f362401ee50ce187c4
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index 5a97bcfe03e5..ec7e27d00bc6 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -517,10 +517,10 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 
 	ret = nfs_updatepage(filp, page, 0, pagelen);
 out_unlock:
+	if (!ret)
+		return VM_FAULT_LOCKED;
 	unlock_page(page);
-	if (ret)
-		ret = VM_FAULT_SIGBUS;
-	return ret;
+	return VM_FAULT_SIGBUS;
 }
 
 static struct vm_operations_struct nfs_file_vm_ops = {