diff options
| author | Hugh Dickins <hugh@veritas.com> | 2005-10-30 02:16:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 05:40:39 +0100 |
| commit | 9e9bef07ce5a342aa6246ebc5c20829d0d5d63d0 (patch) | |
| tree | 6f7286ebbb2c4b8af7bb04897a64b054c67faa4a /mm/memory.c | |
| parent | [PATCH] mm: zap_pte_range dec rss (diff) | |
| download | linux-9e9bef07ce5a342aa6246ebc5c20829d0d5d63d0.tar.xz linux-9e9bef07ce5a342aa6246ebc5c20829d0d5d63d0.zip | |
[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>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c index bc6296398f8b..a25ee1d3e20a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -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; |