hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()
Commit 66aebce747
("hugetlb: fix race condition in hugetlb_fault()")
added code to avoid a race condition by elevating the page refcount in
hugetlb_fault() while calling hugetlb_cow().
However, one code path in hugetlb_cow() includes an assertion that the
page count is 1, whereas it may now also have the value 2 in this path.
The consensus is that this BUG_ON has served its purpose, so rather than
extending it to cover both cases, we just remove it.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: Hillf Danton <dhillf@gmail.com>
Acked-by: Hugh Dickins <hughd@google.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: <stable@vger.kernel.org> [3.0.29+, 3.2.16+, 3.3.3+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
93278814d3
commit
4998a6c0ed
|
@ -2498,7 +2498,6 @@ retry_avoidcopy:
|
|||
if (outside_reserve) {
|
||||
BUG_ON(huge_pte_none(pte));
|
||||
if (unmap_ref_private(mm, vma, old_page, address)) {
|
||||
BUG_ON(page_count(old_page) != 1);
|
||||
BUG_ON(huge_pte_none(pte));
|
||||
spin_lock(&mm->page_table_lock);
|
||||
ptep = huge_pte_offset(mm, address & huge_page_mask(h));
|
||||
|
|
Loading…
Reference in New Issue