summaryrefslogtreecommitdiff
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorWei Yang <richard.weiyang@gmail.com>2020-06-01 21:48:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-02 10:59:09 -0700
commitabca1c84b7575b470789c8686688b11ba3bf138d (patch)
tree4f4e694e6d2279ea24e572c805513290e6844df2 /mm/swapfile.c
parent08d3090fc8dadd7b726dbda99d1baa39382c3f2c (diff)
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 <richard.weiyang@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Hugh Dickins <hughd@google.com> Link: http://lkml.kernel.org/r/20200325220309.9803-2-richard.weiyang@gmail.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swapfile.c')
-rw-r--r--mm/swapfile.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index f3b0a2c4972a..705b11a7a463 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