From: Jackie Liu Date: Mon, 8 Sep 2025 06:26:14 +0000 (+0800) Subject: mm/shmem: remove unused entry_order after large swapin rework X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ca4060a3ad8c3f6e77c87f849309a112204a384;p=users%2Fjedix%2Flinux-maple.git mm/shmem: remove unused entry_order after large swapin rework After commit 93c0476e7057 ("mm/shmem, swap: rework swap entry and index calculation for large swapin"), xas_get_order() will never return a non-zero value for `entry_order` in shmem_split_large_entry(). As a result, the local variable `entry_order` is effectively unused. Clean up the code by removing `entry_order` and directly using `cur_order`. This change is purely a refactor and has no functional impact. No functional change intended. Link: https://lkml.kernel.org/r/20250908062614.89880-1-liu.yun@linux.dev Signed-off-by: Jackie Liu Reviewed-by: Baolin Wang Cc: Hugh Dickins Cc: Kairui Song Signed-off-by: Andrew Morton --- diff --git a/mm/shmem.c b/mm/shmem.c index c750bcae0ee3..87005c086d5a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2187,7 +2187,7 @@ static int shmem_split_large_entry(struct inode *inode, pgoff_t index, { struct address_space *mapping = inode->i_mapping; XA_STATE_ORDER(xas, &mapping->i_pages, index, 0); - int split_order = 0, entry_order; + int split_order = 0; int i; /* Convert user data gfp flags to xarray node gfp flags */ @@ -2205,15 +2205,12 @@ static int shmem_split_large_entry(struct inode *inode, pgoff_t index, goto unlock; } - entry_order = xas_get_order(&xas); - - if (!entry_order) + cur_order = xas_get_order(&xas); + if (!cur_order) goto unlock; /* Try to split large swap entry in pagecache */ - cur_order = entry_order; - swap_index = round_down(index, 1 << entry_order); - + swap_index = round_down(index, 1 << cur_order); split_order = xas_try_split_min_order(cur_order); while (cur_order > 0) {