diff options
| author | Wei Yang <richard.weiyang@gmail.com> | 2020-06-02 07:48:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-02 20:59:08 +0300 |
| commit | f4eaf51a72e5c6d9dc895abdd02676a2ef4c3ae7 (patch) | |
| tree | e4b86268eb2cc6ff33074720af0448e600b2c925 | |
| parent | ca2c55a7371ca3db64f5ac9ed2cb998682bf6fae (diff) | |
| download | linux-f4eaf51a72e5c6d9dc895abdd02676a2ef4c3ae7.tar.xz | |
mm/swapfile.c: explicitly show ssd/non-ssd is handled mutually exclusive
The code shows if this is ssd, it will jump to specific tag and skip the
following code for non-ssd.
Let's use "else if" to explicitly show the mutually exclusion for
ssd/non-ssd to reduce ambiguity.
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-3-richard.weiyang@gmail.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | mm/swapfile.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index b6e68dcf7a18..264d5837257a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -763,9 +763,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si, goto checks; else goto scan; - } - - if (unlikely(!si->cluster_nr--)) { + } else if (unlikely(!si->cluster_nr--)) { if (si->pages - si->inuse_pages < SWAPFILE_CLUSTER) { si->cluster_nr = SWAPFILE_CLUSTER - 1; goto checks; @@ -873,10 +871,8 @@ checks: goto checks; else goto done; - } - - /* non-ssd case, still more slots in cluster? */ - if (si->cluster_nr && !si->swap_map[++offset]) { + } else if (si->cluster_nr && !si->swap_map[++offset]) { + /* non-ssd case, still more slots in cluster? */ --si->cluster_nr; goto checks; } |