Commit 9e9bef07 authored Oct 29, 2005 by Hugh Dickins Committed by Linus Torvalds Oct 29, 2005

[PATCH] mm: do_swap_page race major



Small adjustment: do_swap_page should report its !pte_same race as a major
fault if it had to read into swap cache, because whatever raced with it will
have found page already in cache and reported minor fault.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 86d912f4

mm/memory.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1728,10 +1728,8 @@ static int do_swap_page(struct mm_struct mm, struct vm_area_struct vma,
		*/
		spin_lock(&mm->page_table_lock);
		page_table = pte_offset_map(pmd, address);
		if (unlikely(!pte_same(*page_table, orig_pte))) {
		ret = VM_FAULT_MINOR;
		if (unlikely(!pte_same(*page_table, orig_pte)))
		goto out_nomap;
		}

		if (unlikely(!PageUptodate(page))) {
		ret = VM_FAULT_SIGBUS;