[PATCH] mm/buddy: cleanup on should_fail_alloc_page

[PATCH] mm/buddy: cleanup on should_fail_alloc_page

[Gavin Shan]

In the core function __alloc_pages_nodemask() of buddy allocator, it's
possible for the memory allocation to fail. That's probablly caused
by error injection with expection. In that case, it depends on the
check of error injection covered by function should_fail(). Currently,
function should_fail() has "bool" for its return value, so it's reasonable
to change the return value of function should_fail_alloc_page() into
"bool" as well.

The patch does cleanup on function should_fail_alloc_page() to "bool".

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
---
 mm/page_alloc.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4403009..7892f84 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1529,16 +1529,16 @@ static int __init setup_fail_page_alloc(char *str)
 }
 __setup("fail_page_alloc=", setup_fail_page_alloc);
 
-static int should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
+static bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
 {
 	if (order < fail_page_alloc.min_order)
-		return 0;
+		return false;
 	if (gfp_mask & __GFP_NOFAIL)
-		return 0;
+		return false;
 	if (fail_page_alloc.ignore_gfp_highmem && (gfp_mask & __GFP_HIGHMEM))
-		return 0;
+		return false;
 	if (fail_page_alloc.ignore_gfp_wait && (gfp_mask & __GFP_WAIT))
-		return 0;
+		return false;
 
 	return should_fail(&fail_page_alloc.attr, 1 << order);
 }
@@ -1578,9 +1578,9 @@ late_initcall(fail_page_alloc_debugfs);
 
 #else /* CONFIG_FAIL_PAGE_ALLOC */
 
-static inline int should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
+static inline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
 {
-	return 0;
+	return false;
 }
 
 #endif /* CONFIG_FAIL_PAGE_ALLOC */
-- 
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>

Re: [PATCH] mm/buddy: cleanup on should_fail_alloc_page

[David Rientjes]

On Sat, 9 Jun 2012, Gavin Shan wrote:

> In the core function __alloc_pages_nodemask() of buddy allocator, it's
> possible for the memory allocation to fail. That's probablly caused
> by error injection with expection. In that case, it depends on the
> check of error injection covered by function should_fail(). Currently,
> function should_fail() has "bool" for its return value, so it's reasonable
> to change the return value of function should_fail_alloc_page() into
> "bool" as well.
> 

I think we can remove the first three sentences of this.

> The patch does cleanup on function should_fail_alloc_page() to "bool".
> 
> Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>

Acked-by: David Rientjes <rientjes@google.com>

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

Re: [PATCH] mm/buddy: cleanup on should_fail_alloc_page

[Gavin Shan]

>> In the core function __alloc_pages_nodemask() of buddy allocator, it's
>> possible for the memory allocation to fail. That's probablly caused
>> by error injection with expection. In that case, it depends on the
>> check of error injection covered by function should_fail(). Currently,
>> function should_fail() has "bool" for its return value, so it's reasonable
>> to change the return value of function should_fail_alloc_page() into
>> "bool" as well.
>> 
>
>I think we can remove the first three sentences of this.
>
>> The patch does cleanup on function should_fail_alloc_page() to "bool".
>> 
>> Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
>
>Acked-by: David Rientjes <rientjes@google.com>
>

Thanks, David. I'll adjust the changelog and send next version
as soon as possible :-)

Thanks,
Gavin

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