The patch titled
Subject: mm/mempool: Add 'else' to split mutually exclusive case
has been removed from the -mm tree. Its filename was
mm-mempool-add-else-to-split-mutually-exclusive-case.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Subject: mm/mempool: Add 'else' to split mutually exclusive case
Add else to split mutually exclusive cases and to avoid some unnecessary
check.
akpm: doesn't affect code generation but it's a little cleaner.
[joe@xxxxxxxxxxx: style: braces should be added to the first test]
Link: https://lkml.kernel.org/r/37bbda0e0d94d3324210fa807f4061a9e9bd66bc.camel@perches.comLink: https://lkml.kernel.org/r/20200824115354.7879-1-linmiaohe@xxxxxxxxxx
Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mempool.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/mm/mempool.c~mm-mempool-add-else-to-split-mutually-exclusive-case
+++ a/mm/mempool.c
@@ -57,12 +57,12 @@ static void __check_element(mempool_t *p
static void check_element(mempool_t *pool, void *element)
{
- /* Mempools backed by slab allocator */
- if (pool->free == mempool_free_slab || pool->free == mempool_kfree)
+ if (pool->free == mempool_free_slab ||
+ pool->free == mempool_kfree) {
+ /* Mempools backed by slab allocator */
__check_element(pool, element, ksize(element));
-
- /* Mempools backed by page allocator */
- if (pool->free == mempool_free_pages) {
+ } else if (pool->free == mempool_free_pages) {
+ /* Mempools backed by page allocator */
int order = (int)(long)pool->pool_data;
void *addr = kmap_atomic((struct page *)element);
_
Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are
mm-migrate-avoid-possible-unnecessary-process-right-check-in-kernel_move_pages.patch
