Commit 44e2aa93 authored Oct 26, 2010 by Dean Nelson Committed by Linus Torvalds Oct 26, 2010

mm/hugetlb.c: add missing spin_lock() to hugetlb_cow()

Add missing spin_lock() of the page_table_lock before an error return in
hugetlb_cow(). Callers of hugtelb_cow() expect it to be held upon return.

Signed-off-by: Dean Nelson <dnelson@redhat.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 70384dc6

mm/hugetlb.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2448,8 +2448,11 @@ retry_avoidcopy:
		* When the original hugepage is shared one, it does not have
		* anon_vma prepared.
		*/
		if (unlikely(anon_vma_prepare(vma)))
		if (unlikely(anon_vma_prepare(vma))) {
		/* Caller expects lock to be held */
		spin_lock(&mm->page_table_lock);
		return VM_FAULT_OOM;
		}

		copy_user_huge_page(new_page, old_page, address, vma);
		__SetPageUptodate(new_page);