From: Wei Yang Date: Tue, 2 Jun 2020 04:48:58 +0000 (-0700) Subject: mm/swapfile.c: remove the extra check in scan_swap_map_slots() X-Git-Tag: v5.10.7~2505^2~63 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abca1c84b7575b470789c8686688b11ba3bf138d;p=platform%2Fkernel%2Flinux-rpi.git mm/swapfile.c: remove the extra check in scan_swap_map_slots() scan_swap_map_slots() is only called by scan_swap_map() and get_swap_pages(). Both ensure nr would not exceed SWAP_BATCH. Just remove it. Signed-off-by: Wei Yang Signed-off-by: Andrew Morton Cc: Hugh Dickins Link: http://lkml.kernel.org/r/20200325220309.9803-2-richard.weiyang@gmail.com Signed-off-by: Linus Torvalds --- diff --git a/mm/swapfile.c b/mm/swapfile.c index f3b0a2c..705b11a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -740,9 +740,6 @@ static int scan_swap_map_slots(struct swap_info_struct *si, int latency_ration = LATENCY_LIMIT; int n_ret = 0; - if (nr > SWAP_BATCH) - nr = SWAP_BATCH; - /* * We try to cluster swap pages by allocating them sequentially * in swap. Once we've allocated SWAPFILE_CLUSTER pages this