diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-05-12 16:23:52 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-19 22:20:10 -0700 |
| commit | 71cf4edb1d866d69773bce35f9761d1973b671c9 (patch) | |
| tree | 4872dc9b324a7d3201c0e2387896fb0470a5e868 /fs/nfs | |
| parent | 18b0560ccb3fcda54cc28718647599f494dc62b9 (diff) | |
NFS: Close page_mkwrite() races
commit 7fdf523067666b0eaff330f362401ee50ce187c4 upstream
Follow up to Nick Piggin's patches to ensure that nfs_vm_page_mkwrite
returns with the page lock held, and sets the VM_FAULT_LOCKED flag.
See http://bugzilla.kernel.org/show_bug.cgi?id=12913
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>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index a7c9f7b3ac1..4a57a0f9a2a 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -478,10 +478,10 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) ret = nfs_updatepage(filp, page, 0, pagelen); out_unlock: + if (!ret) + return VM_FAULT_LOCKED; unlock_page(page); - if (ret) - ret = VM_FAULT_SIGBUS; - return ret; + return VM_FAULT_SIGBUS; } static struct vm_operations_struct nfs_file_vm_ops = { |