diff options
| author | Dean Nelson <dnelson@redhat.com> | 2010-10-26 14:22:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 16:52:11 -0700 |
| commit | 44e2aa937e698ea95dd86b2a4fabd734ef2c76db (patch) | |
| tree | 691e3e8b04f486fe8a13fc43587c0144275e7c70 | |
| parent | 70384dc6dcc6aa76762200262820bdb8b724ecd5 (diff) | |
| download | op-kernel-dev-44e2aa937e698ea95dd86b2a4fabd734ef2c76db.zip op-kernel-dev-44e2aa937e698ea95dd86b2a4fabd734ef2c76db.tar.gz | |
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>
| -rw-r--r-- | mm/hugetlb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 96991de..c4a3558 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -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); |
