diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-07 17:02:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:07:03 -0400 |
commit | 2b2ec7554cf7ec5e4412f89a5af6abe8ce950700 (patch) | |
tree | 373355d53c547896ec1fbc8486311efa37dbd18e /fs/nfs | |
parent | 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 (diff) |
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')
-rw-r--r-- | fs/nfs/file.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 3523b895eb4b..5a97bcfe03e5 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) | |||
516 | goto out_unlock; | 516 | goto out_unlock; |
517 | 517 | ||
518 | ret = nfs_updatepage(filp, page, 0, pagelen); | 518 | ret = nfs_updatepage(filp, page, 0, pagelen); |
519 | if (ret == 0) | ||
520 | ret = pagelen; | ||
521 | out_unlock: | 519 | out_unlock: |
522 | unlock_page(page); | 520 | unlock_page(page); |
523 | if (ret) | 521 | if (ret) |