| From | Joonsoo Kim <> | Subject | [PATCH v2 15/20] mm, hugetlb: remove a check for return value of alloc_huge_page() | Date | Fri, 9 Aug 2013 18:26:33 +0900 |
| |
Now, alloc_huge_page() only return -ENOSPEC if failed. So, we don't worry about other return value.
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
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
|