diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-24 17:32:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:42:39 -0700 |
| commit | 7fdf523067666b0eaff330f362401ee50ce187c4 (patch) | |
| tree | 83088db2c3e9b61fd08bdcd0bbba5ace5a35b943 /fs | |
| parent | b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a (diff) | |
| download | op-kernel-dev-7fdf523067666b0eaff330f362401ee50ce187c4.zip op-kernel-dev-7fdf523067666b0eaff330f362401ee50ce187c4.tar.gz | |
NFS: Close page_mkwrite() races
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>
Diffstat (limited to 'fs')
| -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 5a97bcf..ec7e27d 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -517,10 +517,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 = { |
