mm-swapfilec-remove-the-unnecessary-goto-for-ssd-case.patch removed from -mm tree
The patch titled
Subject: mm/swapfile.c: remove the unnecessary goto for SSD case
has been removed from the -mm tree. Its filename was
mm-swapfilec-remove-the-unnecessary-goto-for-ssd-case.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Wei Yang <[email protected]>
Subject: 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.
---
mm/swapfile.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swapfilec-remove-the-unnecessary-goto-for-ssd-case +1 -5
@@ -759,9 +759,7 @@ static int scan_swap_map_slots(struct sw/* SSD algorithm */ if (si->cluster_info) { -if (scan_swap_map_try_ssd_cluster (si, &offset, &scan_base)) - goto checks; -else +if (!scan_swap_map_try_ssd_cluster (si, &offset, &scan_base)) goto scan; }else if (unlikely (!si->cluster_nr--)) {if (si->pages - si->inuse_pages <SWAPFILE_CLUSTER ) {
@@ -869,8 +867,6 @@ checks:if (si->cluster_info) {if (scan_swap_map_try_ssd_cluster (si, &offset, &scan_base)) goto checks; -else - goto done; }else if (si->cluster_nr && !si->swap_map[++offset]) {/* non-ssd case, still more slots in cluster? */ --si->cluster_nr;
_
Patches currently in -mm which might be from [email protected] are
mm-page_allocc-bad_-is-not-necessary-when-pagehwpoison.patch mm-page_allocc-bad_flags-is-not-necessary-for-bad_page.patch mm-page_allocc-rename-free_pages_check_bad-to-check_free_page_bad.patch mm-page_allocc-rename-free_pages_check-to-check_free_page.patch mm-page_allocc-extract-check__page_bad-common-part-to-page_bad_reason.patch mm-page_allocc-use-node_mask_none-in-build_zonelists.patch mm-rename-gfpflags_to_migratetype-to-gfp_migratetype-for-same-convention.patch mm-vmscanc-use-update_lru_size-in-update_lru_sizes.patch bitops-simplify-get_count_order_long.patch bitops-use-the-same-mechanism-for-get_count_order.patch lib-make-a-test-module-with-get_count_order-long.patch