Commit bd2d18da authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds
Browse files

mm/swapfile.c: remove the unnecessary goto for SSD case 



Now we can see there is redundant goto for SSD case.  In these two places,
we can just let the code walk through to the correct tag instead of
explicitly jump to it.

Let's remove them for better readability.

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-4-richard.weiyang@gmail.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f4eaf51a

mm/swapfile.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -759,9 +759,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si, 




	/* SSD algorithm */

	/* SSD algorithm */

	if (si->cluster_info) {

	if (si->cluster_info) {

		if (scan_swap_map_try_ssd_cluster(si, &offset, &scan_base))

		if (!scan_swap_map_try_ssd_cluster(si, &offset, &scan_base))

			goto checks;

		else

			goto scan;

			goto scan;

	} else if (unlikely(!si->cluster_nr--)) {

	} else if (unlikely(!si->cluster_nr--)) {

		if (si->pages - si->inuse_pages < SWAPFILE_CLUSTER) {

		if (si->pages - si->inuse_pages < SWAPFILE_CLUSTER) {
@@ -869,8 +867,6 @@ static int scan_swap_map_slots(struct swap_info_struct *si, 
	if (si->cluster_info) {

	if (si->cluster_info) {

		if (scan_swap_map_try_ssd_cluster(si, &offset, &scan_base))

		if (scan_swap_map_try_ssd_cluster(si, &offset, &scan_base))

			goto checks;

			goto checks;

		else

			goto done;

	} else 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? */

		/* non-ssd case, still more slots in cluster? */

		--si->cluster_nr;

		--si->cluster_nr;