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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 41D72C433E0 for ; Tue, 2 Jun 2020 04:49:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EE67A2074B for ; Tue, 2 Jun 2020 04:49:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="bhgYFqW0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE67A2074B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7ACDE28002B; Tue, 2 Jun 2020 00:49:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75D6D280012; Tue, 2 Jun 2020 00:49:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69A5628002B; Tue, 2 Jun 2020 00:49:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0145.hostedemail.com [216.40.44.145]) by kanga.kvack.org (Postfix) with ESMTP id 4EA8F280012 for ; Tue, 2 Jun 2020 00:49:00 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 13F90180AD804 for ; Tue, 2 Jun 2020 04:49:00 +0000 (UTC) X-FDA: 76883042040.30.steel26_317096a44365c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id EA297180B3C83 for ; Tue, 2 Jun 2020 04:48:59 +0000 (UTC) X-HE-Tag: steel26_317096a44365c X-Filterd-Recvd-Size: 2341 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Jun 2020 04:48:59 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BDC1720734; Tue, 2 Jun 2020 04:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591073339; bh=IYJiHkrbVNWvhnAy857VkDRig3yh/fCs4unAuDVIVcA=; h=Date:From:To:Subject:In-Reply-To:From; b=bhgYFqW0Ej7/GMaQvFrv4igLmMBc+9mk2u6K3y37XLPhHB+EtcwaFCwXI7rSZOvlF DwriYIVTtdrdjSd+r0REmOs4lmE8VP8TcJgO9DSp4rqiuCfq1dyOBY1BnFzj36EWoh XStFnl7yUhaYlzwuBQwYJyNXGS30SX1Fh+67lrgI= Date: Mon, 01 Jun 2020 21:48:58 -0700 From: Andrew Morton To: akpm@linux-foundation.org, hughd@google.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, richard.weiyang@gmail.com, torvalds@linux-foundation.org Subject: [patch 065/128] mm/swapfile.c: remove the extra check in scan_swap_map_slots() Message-ID: <20200602044858.1zSPQmJV4%akpm@linux-foundation.org> In-Reply-To: <20200601214457.919c35648e96a2b46b573fe1@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: EA297180B3C83 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: From: Wei Yang Subject: mm/swapfile.c: remove the extra check in scan_swap_map_slots() scan_swap_map_slots() is only called by scan_swap_map() and get_swap_pages(). Both ensure nr would not exceed SWAP_BATCH. Just remove it. Link: http://lkml.kernel.org/r/20200325220309.9803-2-richard.weiyang@gmail.com Signed-off-by: Wei Yang Cc: Hugh Dickins Signed-off-by: Andrew Morton --- mm/swapfile.c | 3 --- 1 file changed, 3 deletions(-) --- a/mm/swapfile.c~mm-swapfilec-remove-the-extra-check-in-scan_swap_map_slots +++ a/mm/swapfile.c @@ -740,9 +740,6 @@ static int scan_swap_map_slots(struct sw int latency_ration = LATENCY_LIMIT; int n_ret = 0; - if (nr > SWAP_BATCH) - nr = SWAP_BATCH; - /* * We try to cluster swap pages by allocating them sequentially * in swap. Once we've allocated SWAPFILE_CLUSTER pages this _