summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-05-12 16:23:51 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-05-19 22:20:10 -0700
commit18b0560ccb3fcda54cc28718647599f494dc62b9 (patch)
tree46b7dcbd6c0165a644f64971edc803f2ca9ec3c6
parentb413c3438b84245825d03aeb80ecd9bae3af73a6 (diff)
downloadlwn-18b0560ccb3fcda54cc28718647599f494dc62b9.tar.gz
lwn-18b0560ccb3fcda54cc28718647599f494dc62b9.zip
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> Cc: Nick Piggin <npiggin@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/nfs/file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 62e5b28c9db7..a7c9f7b3ac1b 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -477,8 +477,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)