summaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2015-02-10 23:11:28 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 23:30:33 +0100
commit74ec67511d36f9c731065b1dae7d9638a3b639d3 (patch)
tree97d5265cbe2418404ded25100c2e94ac462ec29d /mm/memory.c
parentxtensa: drop _PAGE_FILE and pte_file()-related helpers (diff)
downloadlinux-74ec67511d36f9c731065b1dae7d9638a3b639d3.tar.xz
linux-74ec67511d36f9c731065b1dae7d9638a3b639d3.zip
mm: memory: remove ->vm_file check on shared writable vmas
Shared anonymous mmaps are implemented with shmem files, so all VMAs with shared writable semantics also have an underlying backing file. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Jan Kara <jack@suse.cz> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--mm/memory.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 9aa09217fe20..0e9b32610655 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2127,9 +2127,7 @@ reuse:
balance_dirty_pages_ratelimited(mapping);
}
- /* file_update_time outside page_lock */
- if (vma->vm_file)
- file_update_time(vma->vm_file);
+ file_update_time(vma->vm_file);
}
put_page(dirty_page);
if (page_mkwrite) {
@@ -2971,8 +2969,7 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
balance_dirty_pages_ratelimited(mapping);
}
- /* file_update_time outside page_lock */
- if (vma->vm_file && !vma->vm_ops->page_mkwrite)
+ if (!vma->vm_ops->page_mkwrite)
file_update_time(vma->vm_file);
return ret;