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=unavailable 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 B0188C2D0E7 for ; Wed, 25 Mar 2020 22:03:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5922420719 for ; Wed, 25 Mar 2020 22:03:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WYC6c5VQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5922420719 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 D06436B0008; Wed, 25 Mar 2020 18:03:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C8F986B000A; Wed, 25 Mar 2020 18:03:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B57696B000C; Wed, 25 Mar 2020 18:03:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0112.hostedemail.com [216.40.44.112]) by kanga.kvack.org (Postfix) with ESMTP id 9A2EC6B0008 for ; Wed, 25 Mar 2020 18:03:26 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A1BC41804474A for ; Wed, 25 Mar 2020 22:03:26 +0000 (UTC) X-FDA: 76635261612.13.owl86_754a055438a4c X-HE-Tag: owl86_754a055438a4c X-Filterd-Recvd-Size: 3300 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Mar 2020 22:03:25 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id h15so5401309wrx.9 for ; Wed, 25 Mar 2020 15:03:25 -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=agvIO6IAC74tbDrcVh+mwo/yT2bxjnoGYoZ36w/G8wI=; b=WYC6c5VQO1ju237T5Q+oZJnUvpwVU6UMDzPNqJoZ5i3WQHvpLkSUaHlVBlt0snttNR JaWW25ZiFwHJAFBSfD9+H/EP0RDZY4p/pjzjZVw1Jv7nyt+HdR7plTSucKqgBqGKNuTR dC5yA9JG3lYDvia6iSH8j5rLsayQrK9ot8A1pL7llwKk5A0uytgrKoDeA7+BxEtzzlPP +wHlweCpXRNSLtDGijcTK/lB6R6IN1avAmitao49Axw7j7uWK6zbL7zHJZxkqNMOy1EA g1bGCHHNF2xJKaaDKvuC9WO+MA7eRiMtZRDlZAp40w+KhwpXeS4Zv6YOGGdEu1BuRpSI T4cg== 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=agvIO6IAC74tbDrcVh+mwo/yT2bxjnoGYoZ36w/G8wI=; b=nlYCR+Q3EbodYgTxeQFcKeMbJhpx+r4sH+1GlWy1V5oGWJD9RxrshDf11Ggn2WBeZt cMblfJ/ZYTnNunhu/lGiQmcIR7i7A1685lTj9ERJR1OYkkiv+MOAfDd2W6/g4JIcKcDp FbutLKw70uo8IpBt0WthLkwEVZILIxRNoDr5N85Dv3r2jhOtuynGlMhB/jenG8gvALgu gvM3DpvciccmIOtY85Z+u7Jc+te5IPblkr2yHZ3LiWJ5yWegjbZNuzUWFfIdUP03O+qf G32uve8eaTeSPWsLz4jk39BcQc8xGPCFdJaF/Bm/JkrftKgNOIV1F4Mp37mK8R6njHaF 8MjA== X-Gm-Message-State: ANhLgQ3fC9xbX0pE+zj3CqEOAoq8TMMIzgkpm8BLcXhCA1SINQj+ov1+ BNrK//0i394cVrveYdZI5Ss= X-Google-Smtp-Source: ADFU+vuBltj8DZBlHNgYky+cwNcndJJYwg6qRPvBFLxAZRgw/+d63+IXqaflixa3ETgMJ0d8z1JPrg== X-Received: by 2002:adf:83c4:: with SMTP id 62mr6015181wre.105.1585173804669; Wed, 25 Mar 2020 15:03:24 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id y200sm567990wmc.20.2020.03.25.15.03.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 15:03:24 -0700 (PDT) From: Wei Yang To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH 1/2] mm/swapfile.c: simplify the calculation of n_goal Date: Wed, 25 Mar 2020 22:03:08 +0000 Message-Id: <20200325220309.9803-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: Use min3() to simplify the comparison and make it more self-explaining. Signed-off-by: Wei Yang --- mm/swapfile.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 2c33ff456ed5..85b151d73128 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1004,11 +1004,7 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size) 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); -- 2.23.0