From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B85CCC43331 for ; Sat, 28 Mar 2020 06:06:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7C6F8206F2 for ; Sat, 28 Mar 2020 06:06:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HHkzn15h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C6F8206F2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A81476B0036; Sat, 28 Mar 2020 02:06:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A32946B0037; Sat, 28 Mar 2020 02:06:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D2336B006C; Sat, 28 Mar 2020 02:06:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0050.hostedemail.com [216.40.44.50]) by kanga.kvack.org (Postfix) with ESMTP id 6F9D66B0036 for ; Sat, 28 Mar 2020 02:06:13 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 42B6F52D6 for ; Sat, 28 Mar 2020 06:06:13 +0000 (UTC) X-FDA: 76643735826.20.cars95_535d92d9e3339 X-HE-Tag: cars95_535d92d9e3339 X-Filterd-Recvd-Size: 4014 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Mar 2020 06:06:12 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id w10so14374369wrm.4 for ; Fri, 27 Mar 2020 23:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BUUZ6nzVONK+blk4chCmCKkx96rDIegQpK/XZUn6XmE=; b=HHkzn15hN+SVYEBnyxtPwckF/8L7+u1V9LuYJGyb5xwQ/FGTMaqBLEzHiDa5eqa43I VMOmVU4zoM+pP91+5XGLfIgDq/ihi6Qvh688pTQQMXOyM57xIhTiKrIngmkpNujmoUTj 1PTCyMvBh1QcKUoAWqVq44DXK0xAeyR/wTPNlPRX7RgOyOgtj4EsTmg01H0vGqyuBo0a l75GUu1rWZT5gQzS4xjcWorO7XrebX+QzchVh/WwQhRrkCsbtEjCS7/WAlEfVhBDS9eO Fz8gNdXJoF0VHRuPOlWDdHWXe3OsdSo3Ws8zus4O6SZCyaIl1qUvcKcIXbOdjeWy1+Gn MBaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BUUZ6nzVONK+blk4chCmCKkx96rDIegQpK/XZUn6XmE=; b=okIp+Z7PlRjc18XX0IXWwdkjotOL+4xcjfb5oDqDtwrY0DdHj7mKUsxFi25Vb/a1c4 Y6R9eFYlE+iBSaEvHv5H5kWomlNEweNsjyyl7Eg4J4mYZ7QD/B8gXIfzu1FMOrN1TRWP SHYmyObYofhjdfs5WtjINGDeV8aLVnxmuyTRffgPdQafEPiKPOdm4IHMVsaPyovbpWLQ uNtrDeTB0Z7yXTEsH4g9dV2mhhyGWf2ZmQR9oS2RdxmmyXkDif7HT5oPC/FNToR4aVLW jq38XZQU2AQddapryNJOJS8XZPvGK28Gr9cRANhCz3S+upoIBYg72I1Q3BPqxkDuXp6V Tv0Q== X-Gm-Message-State: ANhLgQ2TYeq7i9VULg33iQW3o9xL+BQAjpZ0U7NX+Jpz78ASyoPsH7He RhT9IFEZUiWimUEqCO9KGIY= X-Google-Smtp-Source: ADFU+vuoscb5qUswTMJY9JhIFuKoRbiDEjYT3ClleQdVv32S5WeSAfMrJCNUnVEM63WwVMIwO+OU7w== X-Received: by 2002:adf:9b9d:: with SMTP id d29mr3229523wrc.294.1585375571758; Fri, 27 Mar 2020 23:06:11 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id m19sm11229021wml.48.2020.03.27.23.06.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 23:06:11 -0700 (PDT) From: Wei Yang To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH 2/3] mm/swapfile.c: explicitly show ssd/non-ssd is handled mutually exclusive Date: Sat, 28 Mar 2020 06:05:19 +0000 Message-Id: <20200328060520.31449-3-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200328060520.31449-1-richard.weiyang@gmail.com> References: <20200328060520.31449-1-richard.weiyang@gmail.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000080, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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: Wei Yang --- mm/swapfile.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 52afb74fc3d1..adf48d4b1b63 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -760,9 +760,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si, 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; @@ -870,10 +868,8 @@ static int scan_swap_map_slots(struct swap_info_struct *si, goto checks; else goto done; - } - - /* non-ssd case, still more slots in cluster? */ - 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? */ --si->cluster_nr; goto checks; } -- 2.23.0