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

mm/hugetlb.c: avoid double unlock_page() in hugetlb_fault() 

Have hugetlb_fault() call unlock_page(page) only if it had previously
called lock_page(page).

Setting CONFIG_DEBUG_VM=y and then running the libhugetlbfs test suite,
resulted in the tripping of VM_BUG_ON(!PageLocked(page)) in
unlock_page() having been called by hugetlb_fault() when page ==
pagecache_page.  This patch remedied the problem.

Signed-off-by: Dean Nelson <dnelson@redhat.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dean Nelson 2010-12-02 14:31:12 -08:00 committed by Linus Torvalds
parent 94c35de9a9
commit 1f64d69c7a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mm/hugetlb.c
View File

@ -2738,7 +2738,8 @@ out_page_table_lock:
unlock_page(pagecache_page);
put_page(pagecache_page);
}
unlock_page(page);
if (page != pagecache_page)
unlock_page(page);
out_mutex:
mutex_unlock(&hugetlb_instantiation_mutex);