diff options
| author |   Wei Yang <richard.weiyang@gmail.com> | 2020-06-01 21:49:01 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-02 10:59:09 -0700 |
| commit | 0fd0e19e4d0e9c84117584783535a57ec3ae98c6 (patch) | |
| tree | 3973516dc52c52970a1747598d0c504ca7a8c946 /mm/swapfile.c | |
| parent | mm/swapfile.c: remove the extra check in scan_swap_map_slots() (diff) | |
| download | linux-dev-0fd0e19e4d0e9c84117584783535a57ec3ae98c6.tar.xz linux-dev-0fd0e19e4d0e9c84117584783535a57ec3ae98c6.zip | |
mm/swapfile.c: found_free could be represented by (tmp < max)
This is not necessary to use the variable found_free to record the status.
Just check tmp and max is enough.
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Hugh Dickins <hughd@google.com>
Link: http://lkml.kernel.org/r/20200421213824.8099-1-richard.weiyang@gmail.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 705b11a7a463..263e3d86a114 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -601,7 +601,6 @@ static bool scan_swap_map_try_ssd_cluster(struct swap_info_struct *si, { struct percpu_cluster *cluster; struct swap_cluster_info *ci; - bool found_free; unsigned long tmp, max; new_cluster: @@ -623,8 +622,6 @@ new_cluster: return false; } - found_free = false; - /* * Other CPUs can use our cluster if they can't find a free cluster, * check if there is still free entry in the cluster @@ -638,21 +635,19 @@ new_cluster: } ci = lock_cluster(si, tmp); while (tmp < max) { - if (!si->swap_map[tmp]) { - found_free = true; + if (!si->swap_map[tmp]) break; - } tmp++; } unlock_cluster(ci); - if (!found_free) { + if (tmp >= max) { cluster_set_null(&cluster->index); goto new_cluster; } cluster->next = tmp + 1; *offset = tmp; *scan_base = tmp; - return found_free; + return tmp < max; } static void __del_from_avail_list(struct swap_info_struct *p) |