mm/swap_state.c: optimize the code in clear_shadow_from_swap_cache()

Use ALIGN to achieve the same effect and simplify the code.

Link: https://lkml.kernel.org/r/20250205092721.9395-3-bhe@redhat.com
Signed-off-by: Baoquan He <bhe@redhat.com>
Cc: Chris Li <chrisl@kernel.org>
Cc: Kairui Song <ryncsn@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/swap_state.c b/mm/swap_state.c
index aabde86d1f47e67a20ff1b8bd59aaf48b2e2250e..8a84371980e94fde4e3da5e7d902978269f74cf1 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -270,9 +270,7 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin,
                xa_unlock_irq(&address_space->i_pages);
 
                /* search the next swapcache until we meet end */
-               curr >>= SWAP_ADDRESS_SPACE_SHIFT;
-               curr++;
-               curr <<= SWAP_ADDRESS_SPACE_SHIFT;
+               curr = ALIGN((curr + 1), SWAP_ADDRESS_SPACE_PAGES);
                if (curr > end)
                        break;
        }