From: akpm@linux-foundation.org Subject: [merged] =?US-ASCII?Q?mm-swapfilec-explicitly-show-ssd-non-ssd-is-handled-mutually?= =?US-ASCII?Q?-exclusive.patch?= removed from -mm tree Date: Tue, 02 Jun 2020 14:40:12 -0700 Message-ID: <20200602214012.b8CFA5LIb%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: Received: from mail.kernel.org ([198.145.29.99]:54370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726174AbgFBVkM (ORCPT ); Tue, 2 Jun 2020 17:40:12 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org, richard.weiyang@gmail.com, tim.c.chen@linux.intel.com The patch titled Subject: mm/swapfile.c: explicitly show ssd/non-ssd is handled mutually exclusive has been removed from the -mm tree. Its filename was mm-swapfilec-explicitly-show-ssd-non-ssd-is-handled-mutually-exclusive.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Wei Yang Subject: 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. Link: http://lkml.kernel.org/r/20200328060520.31449-3-richard.weiyang@gmail.com Signed-off-by: Wei Yang Reviewed-by: Andrew Morton Cc: Tim Chen Signed-off-by: Andrew Morton --- mm/swapfile.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) --- a/mm/swapfile.c~mm-swapfilec-explicitly-show-ssd-non-ssd-is-handled-mutually-exclusive +++ a/mm/swapfile.c @@ -763,9 +763,7 @@ static int scan_swap_map_slots(struct sw 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; - }