diff --git a/[refs] b/[refs]
index 389a3f2b5fc2..24c4c1d9cc65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf4285e75c3272ad9bfdeb886d247962bb2985f8
+refs/heads/master: 3d509e5454a0a5ac88bf3191ab65d85952c1de31
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index 4560fc2ddb4a..ef57a5ae5904 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -349,7 +349,9 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
 	unlock_page(page);
 	page_cache_release(page);
 
-	return status < 0 ? status : copied;
+	if (status < 0)
+		return status;
+	return copied;
 }
 
 static void nfs_invalidate_page(struct page *page, unsigned long offset)