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 have "bool" for its return value.
Unified · Split
| @@ -1529,16 +1529,16 @@ static int __init setup_fail_page_alloc(char *str) · 1528 unmodified lines | |||
| 1529 | } | 1529 | } |
| 1530 | __setup("fail_page_alloc=", setup_fail_page_alloc); | 1530 | __setup("fail_page_alloc=", setup_fail_page_alloc); |
| 1531 | 1531 | ||
| 1532 | static int should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) | 1532 | static bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) |
| 1533 | { | 1533 | { |
| 1534 | if (order < fail_page_alloc.min_order) | 1534 | if (order < fail_page_alloc.min_order) |
| 1535 | return 0; | 1535 | return false; |
| 1536 | if (gfp_mask & __GFP_NOFAIL) | 1536 | if (gfp_mask & __GFP_NOFAIL) |
| 1537 | return 0; | 1537 | return false; |
| 1538 | if (fail_page_alloc.ignore_gfp_highmem && (gfp_mask & __GFP_HIGHMEM)) | 1538 | if (fail_page_alloc.ignore_gfp_highmem && (gfp_mask & __GFP_HIGHMEM)) |
| 1539 | return 0; | 1539 | return false; |
| 1540 | if (fail_page_alloc.ignore_gfp_wait && (gfp_mask & __GFP_WAIT)) | 1540 | if (fail_page_alloc.ignore_gfp_wait && (gfp_mask & __GFP_WAIT)) |
| 1541 | return 0; | 1541 | return false; |
| 1542 | 1542 | ||
| 1543 | return should_fail(&fail_page_alloc.attr, 1 << order); | 1543 | return should_fail(&fail_page_alloc.attr, 1 << order); |
| 1544 | } | 1544 | } |
| @@ -1578,9 +1578,9 @@ late_initcall(fail_page_alloc_debugfs); · 33 unmodified lines | |||
| 1578 | 1578 | ||
| 1579 | #else /* CONFIG_FAIL_PAGE_ALLOC */ | 1579 | #else /* CONFIG_FAIL_PAGE_ALLOC */ |
| 1580 | 1580 | ||
| 1581 | static inline int should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) | 1581 | static inline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) |
| 1582 | { | 1582 | { |
| 1583 | return 0; | 1583 | return false; |
| 1584 | } | 1584 | } |
| 1585 | 1585 | ||
| 1586 | #endif /* CONFIG_FAIL_PAGE_ALLOC */ | 1586 | #endif /* CONFIG_FAIL_PAGE_ALLOC */ |