aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-04-07 14:02:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 14:07:03 -0700
commit2b2ec7554cf7ec5e4412f89a5af6abe8ce950700 (patch)
tree373355d53c547896ec1fbc8486311efa37dbd18e /fs/nfs/file.c
parent8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 (diff)
downloadkernel_samsung_tuna-2b2ec7554cf7ec5e4412f89a5af6abe8ce950700.zip
kernel_samsung_tuna-2b2ec7554cf7ec5e4412f89a5af6abe8ce950700.tar.gz
kernel_samsung_tuna-2b2ec7554cf7ec5e4412f89a5af6abe8ce950700.tar.bz2
NFS: Fix the return value in nfs_page_mkwrite()
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>
Diffstat (limited to 'fs/nfs/file.c')
-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 3523b89..5a97bcf 100644
--- a/fs/nfs/file.c
+++ b/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)