Commit f4eaf51a authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds

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: default avatarWei Yang <richard.weiyang@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarAndrew 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.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ca2c55a7
...@@ -763,9 +763,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si, ...@@ -763,9 +763,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si,
goto checks; goto checks;
else else
goto scan; goto scan;
} } else if (unlikely(!si->cluster_nr--)) {
if (unlikely(!si->cluster_nr--)) {
if (si->pages - si->inuse_pages < SWAPFILE_CLUSTER) { if (si->pages - si->inuse_pages < SWAPFILE_CLUSTER) {
si->cluster_nr = SWAPFILE_CLUSTER - 1; si->cluster_nr = SWAPFILE_CLUSTER - 1;
goto checks; goto checks;
...@@ -873,10 +871,8 @@ static int scan_swap_map_slots(struct swap_info_struct *si, ...@@ -873,10 +871,8 @@ static int scan_swap_map_slots(struct swap_info_struct *si,
goto checks; goto checks;
else else
goto done; goto done;
} } else if (si->cluster_nr && !si->swap_map[++offset]) {
/* non-ssd case, still more slots in cluster? */
/* non-ssd case, still more slots in cluster? */
if (si->cluster_nr && !si->swap_map[++offset]) {
--si->cluster_nr; --si->cluster_nr;
goto checks; goto checks;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment