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.6 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 E0F0FC2BA19 for ; Sun, 19 Apr 2020 01:39:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 479F221927 for ; Sun, 19 Apr 2020 01:39:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tD75O/Fh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 479F221927 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 7BB9B8E0005; Sat, 18 Apr 2020 21:39:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76CBC8E0003; Sat, 18 Apr 2020 21:39:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A95F8E0005; Sat, 18 Apr 2020 21:39:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id 508F08E0003 for ; Sat, 18 Apr 2020 21:39:31 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 05571824556B for ; Sun, 19 Apr 2020 01:39:31 +0000 (UTC) X-FDA: 76722897342.24.cord30_35f31cb3efd60 X-HE-Tag: cord30_35f31cb3efd60 X-Filterd-Recvd-Size: 4138 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Sun, 19 Apr 2020 01:39:30 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id r7so4515046edo.11 for ; Sat, 18 Apr 2020 18:39:30 -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; bh=YQ0IcD0MJa87Cl5cTZ+wxBcgc8xap3RC76BVjfIWVzU=; b=tD75O/FhAiU4tZlZn9qCLTOtwiBMTsQyy00zKr8jfD0SDT/f3eOlUGzOufRnPAAoF9 I1st4PwIcwVtGKwAMlZ4my/xrbNqmEQtJhw6/jhriv0h185vZFB7nPbIG5FJ+u16OqZn cGAtjUJqvcLR8hzRG97pFV4xaPf4qVTGK3WtUa43hyU1OwHZzQ54+ARTkj865FqFrcBg FthwoEEPalDoI6PZu9z1/93deBEl2du4YAFaAvz2NZx+odT7qSOwE5Imk6bhd9B0LKV0 8UW4n/TEPNKHzxXVr2LwrB6rPCb9Y0gxpJoFh055ywb0OcJOjrKukGTAD4DcgJ2sSSGr aIaA== 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; bh=YQ0IcD0MJa87Cl5cTZ+wxBcgc8xap3RC76BVjfIWVzU=; b=O2HMN6Wr59HRtvR8yV6y8Ajp97fKyksEfuP3cKys5rucP7Qy1d+/R2yUM5VJ5uwdti yrV8VXNsd9QRx1AixwVF95CbBv4hoPj7OiY6Eeq8ks29VdBy4cFyVwcnUfCf96l9wqFn xR4xbELTG+IUcJpri8TrOEWmi3krQHcgTsQxe1cPBabzCzISKBNYe05nRHTR4czjHg2x E7T9ykMFY2NBFW8u67uYnQqDamtGgUVMALAkBV1Bups8GdiuGQxGOOA93yIxlS+vQ8gt BB+fw7oSPoAAG9j0fA0L6ZepQaO7cWKm7Nl2+xPPTXASWC6s6wOOkt1bSwS1iKoVTdMd 7qrw== X-Gm-Message-State: AGi0PubVoopeO6IpQt16BeQUjk64TllmBX/VVsyn9rYIc3uOgN0v8LDP 7Jez/6JQ8KImVBJpjAZKBhw= X-Google-Smtp-Source: APiQypKtrQeAtBQk489goKZCmTEe3TzZzMjbpTdAWBmVki5DbC5eT0gEuTu4vqJXhH84TKEqepnGNA== X-Received: by 2002:a50:cd89:: with SMTP id p9mr8914024edi.188.1587260369506; Sat, 18 Apr 2020 18:39:29 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id k33sm3345395edc.18.2020.04.18.18.39.28 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Apr 2020 18:39:28 -0700 (PDT) From: Wei Yang To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, tim.c.chen@linux.intel.com, ying.huang@intel.com, Wei Yang Subject: [PATCH 1/4] mm/swapfile.c: found_free could be represented by (tmp < max) Date: Sun, 19 Apr 2020 01:39:18 +0000 Message-Id: <20200419013921.14390-1-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 --- mm/swapfile.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index c457f3be6944..654bad5173bc 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 @@ static bool scan_swap_map_try_ssd_cluster(struct swap_info_struct *si, 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 @@ static bool scan_swap_map_try_ssd_cluster(struct swap_info_struct *si, } 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) -- 2.23.0