[PATCH v2 15/20] mm, hugetlb: remove a check for return value of alloc_huge_page()
From: Joonsoo Kim <hidden>
Date: 2013-08-09 09:28:53
Also in:
lkml
Subsystem:
hugetlb subsystem, memory management, the rest · Maintainers:
Muchun Song, Oscar Salvador, Andrew Morton, Linus Torvalds
Now, alloc_huge_page() only return -ENOSPEC if failed. So, we don't worry about other return value. Signed-off-by: Joonsoo Kim <redacted>
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index bc666cf..24de2ca 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c@@ -2544,7 +2544,6 @@ retry_avoidcopy: new_page = alloc_huge_page(vma, address, use_reserve); if (IS_ERR(new_page)) { - long err = PTR_ERR(new_page); page_cache_release(old_page); /*
@@ -2573,10 +2572,7 @@ retry_avoidcopy: /* Caller expects lock to be held */ spin_lock(&mm->page_table_lock); - if (err == -ENOMEM) - return VM_FAULT_OOM; - else - return VM_FAULT_SIGBUS; + return VM_FAULT_SIGBUS; } /*
@@ -2707,11 +2703,7 @@ retry: page = alloc_huge_page(vma, address, use_reserve); if (IS_ERR(page)) { - ret = PTR_ERR(page); - if (ret == -ENOMEM) - ret = VM_FAULT_OOM; - else - ret = VM_FAULT_SIGBUS; + ret = VM_FAULT_SIGBUS; goto out; } clear_huge_page(page, address, pages_per_huge_page(h));
--
1.7.9.5
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>