diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-07 14:02:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-18 16:35:07 -0700 |
| commit | 668d834cdaebbd0280e4bd497205ea66ee0bf23f (patch) | |
| tree | b57f2176346005281997c370e5a991c22832a374 | |
| parent | e3fedc3d38a8b6a513f34e30ebc4d685c49261c9 (diff) | |
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 cec79392e4ba..f4a5bbbed14f 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -480,8 +480,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) |