mm: filemap_fault: unique path for locking page
Subsystems (3)
[email protected]
maintainerPATCH 50/176 mm: filemap_fault: unique path for locking page
From: Michel Lespinasse <[email protected]>
Introduce a single location where filemap_fault() locks the desired page. There used to be two such places, depending if the initial find_get_page() was successful or not.
Signed-off-by Michel Lespinasse <[email protected]>
Acked-by Rik van Riel <[email protected]>
Cc Nick Piggin <[email protected]>
Reviewed-by Wu Fengguang <[email protected]>
Cc Ying Han <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/filemap.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
mm/filemap.c renamed from mm/filemap.c~mm-filemap_fault-unique-path-for-locking-page +11 -9
@@ -1539,25 +1539,27 @@ int filemap_fault(struct vm_area_struct* waiting for the lock. */ do_async_mmap_readahead (vma, ra, file, page, offset); -lock_page (page); - -/* Did it get truncated? */ -if (unlikely (page->mapping != mapping)) { -unlock_page (page); -put_page (page); - goto no_cached_page; - } }else {/* No page in the page cache at all */ do_sync_mmap_readahead (vma, ra, file, offset);count_vm_event (PGMAJFAULT ); ret =VM_FAULT_MAJOR ; retry_find: - page =find_lock_page (mapping, offset); + page =find_get_page (mapping, offset);if (!page) goto no_cached_page; } +lock_page (page); + +/* Did it get truncated? */ +if (unlikely (page->mapping != mapping)) { +unlock_page (page); +put_page (page); + goto retry_find; + } +VM_BUG_ON (page->index != offset); +/* * We have a locked page in the page cache, now we need to check * that it's up-to-date. If not, it is going to be due to an error.
_