From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: [patch 064/128] mm/swapfile.c: simplify the calculation of n_goal Date: Mon, 01 Jun 2020 21:48:55 -0700 Message-ID: <20200602044855.2nCLt6lXB%akpm@linux-foundation.org> References: <20200601214457.919c35648e96a2b46b573fe1@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:40112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725872AbgFBEs4 (ORCPT ); Tue, 2 Jun 2020 00:48:56 -0400 In-Reply-To: <20200601214457.919c35648e96a2b46b573fe1@linux-foundation.org> Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org 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 From: Wei Yang Subject: mm/swapfile.c: simplify the calculation of n_goal Use min3() to simplify the comparison and make it more self-explaining. Link: http://lkml.kernel.org/r/20200325220309.9803-1-richard.weiyang@gmail.com Signed-off-by: Wei Yang Reviewed-by: Andrew Morton Cc: Hugh Dickins Signed-off-by: Andrew Morton --- mm/swapfile.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/mm/swapfile.c~mm-swapfilec-simplify-the-calculation-of-n_goal +++ a/mm/swapfile.c @@ -994,11 +994,7 @@ int get_swap_pages(int n_goal, swp_entry if (avail_pgs <= 0) goto noswap; - if (n_goal > SWAP_BATCH) - n_goal = SWAP_BATCH; 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 36574C433E0 for ; Tue, 2 Jun 2020 04:49:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EFE00206C3 for ; Tue, 2 Jun 2020 04:49:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="GKK/RGNW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFE00206C3 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 AC05C280029; Tue, 2 Jun 2020 00:48:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F58B280012; Tue, 2 Jun 2020 00:48:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 910B3280029; Tue, 2 Jun 2020 00:48:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id 6F35C280012 for ; Tue, 2 Jun 2020 00:48:57 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3780C8248047 for ; Tue, 2 Jun 2020 04:48:57 +0000 (UTC) X-FDA: 76883041914.29.drop76_310631dfcca3e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 1857B18086E56 for ; Tue, 2 Jun 2020 04:48:57 +0000 (UTC) X-HE-Tag: drop76_310631dfcca3e X-Filterd-Recvd-Size: 2331 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Jun 2020 04:48:56 +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 CE49E206C3; Tue, 2 Jun 2020 04:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591073336; bh=u+MpHoqGQ9ZMzvsxZBfxzsyNJs9IerDKnVwmCes+QBE=; h=Date:From:To:Subject:In-Reply-To:From; b=GKK/RGNWSdysAefDjbEcAWNiVk5jNuJRZF2jCE986rgoc8drO+PzCWwKkwsXteIuN vn3KKOgZAWvxSMwMuZKpLxzmVav4fn+KJHbswkLuG//Mr9G0JqQ7ruaximIyvq5tf3 n0o87JTPu3CyEP7lGD4DlN8UkVFMZJeUfDyHXtPk= Date: Mon, 01 Jun 2020 21:48:55 -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 064/128] mm/swapfile.c: simplify the calculation of n_goal Message-ID: <20200602044855.2nCLt6lXB%akpm@linux-foundation.org> In-Reply-To: <20200601214457.919c35648e96a2b46b573fe1@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: 1857B18086E56 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: simplify the calculation of n_goal Use min3() to simplify the comparison and make it more self-explaining. Link: http://lkml.kernel.org/r/20200325220309.9803-1-richard.weiyang@gmail.com Signed-off-by: Wei Yang Reviewed-by: Andrew Morton Cc: Hugh Dickins Signed-off-by: Andrew Morton --- mm/swapfile.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/mm/swapfile.c~mm-swapfilec-simplify-the-calculation-of-n_goal +++ a/mm/swapfile.c @@ -994,11 +994,7 @@ int get_swap_pages(int n_goal, swp_entry if (avail_pgs <= 0) goto noswap; - if (n_goal > SWAP_BATCH) - n_goal = SWAP_BATCH; - - if (n_goal > avail_pgs) - n_goal = avail_pgs; + n_goal = min3((long)n_goal, (long)SWAP_BATCH, avail_pgs); atomic_long_sub(n_goal * size, &nr_swap_pages); _