summaryrefslogtreecommitdiffstats
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorWei Yang <richard.weiyang@gmail.com>2020-06-02 06:48:46 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-02 19:59:08 +0200
commitca2c55a7371ca3db64f5ac9ed2cb998682bf6fae (patch)
treec2b3e571986f04371390ef9cb1f731ab2d893417 /mm/swapfile.c
parentmm: swap: properly update readahead statistics in unuse_pte_range() (diff)
downloadlinux-ca2c55a7371ca3db64f5ac9ed2cb998682bf6fae.tar.xz
linux-ca2c55a7371ca3db64f5ac9ed2cb998682bf6fae.zip
mm/swapfile.c: offset is only used when there is more slots
scan_swap_map_slots() is used to iterate swap_map[] array for an available swap entry. While after several optimizations, e.g. for ssd case, the logic of this function is a little not easy to catch. This patchset tries to clean up the logic a little: * shows the ssd/non-ssd case is handled mutually exclusively * remove some unnecessary goto for ssd case This patch (of 3): When si->cluster_nr is zero, function would reach done and return. The increased offset would not be used any more. This means we can move the offset increment into the if clause. This brings a further code cleanup possibility. Signed-off-by: Wei Yang <richard.weiyang@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Tim Chen <tim.c.chen@linux.intel.com> Link: http://lkml.kernel.org/r/20200328060520.31449-1-richard.weiyang@gmail.com Link: http://lkml.kernel.org/r/20200328060520.31449-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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 106ff9c1a6b9..b6e68dcf7a18 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -874,11 +874,9 @@ checks:
else
goto done;
}
- /* non-ssd case */
- ++offset;
/* non-ssd case, still more slots in cluster? */
- if (si->cluster_nr && !si->swap_map[offset]) {
+ if (si->cluster_nr && !si->swap_map[++offset]) {
--si->cluster_nr;
goto checks;
}