[PATCH 12/18] mm, hugetlb: remove a check for return value of alloc_huge_page()

From: Joonsoo Kim
Date: Mon Jul 29 2013 - 01:35:25 EST


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@xxxxxxx>

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 94173e0..35ccdad 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2562,7 +2562,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);

/*
@@ -2591,10 +2590,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;
}

/*
@@ -2720,11 +2716,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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/