dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Hugh Dickins 2005-10-29 18:16:15 -07:00 committed by Linus Torvalds
parent 86d912f41d
commit 9e9bef07ce
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/memory.c
View File

@ -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;