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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 F3114C433E0 for ; Mon, 15 Feb 2021 21:02:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A79BD64DEC for ; Mon, 15 Feb 2021 21:02:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A79BD64DEC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 99EF78D0142; Mon, 15 Feb 2021 16:02:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 94DA98D0140; Mon, 15 Feb 2021 16:02:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8412E8D0142; Mon, 15 Feb 2021 16:02:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id 6EA898D0140 for ; Mon, 15 Feb 2021 16:02:21 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 3F2CF2DFA for ; Mon, 15 Feb 2021 21:02:21 +0000 (UTC) X-FDA: 77821725282.26.drain64_0e098b32763e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 19186180EEAB7 for ; Mon, 15 Feb 2021 21:02:21 +0000 (UTC) X-HE-Tag: drain64_0e098b32763e X-Filterd-Recvd-Size: 4383 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Mon, 15 Feb 2021 21:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=YXglIPTcdnUpspPjiNXAqzaWfXqjrvS8v9+PgPprkxQ=; b=VCyt/VJX+fdKYmMs+SqyDALypH 9DhMlyzaeeJoBnk+puDueGvUcQQwcS2Pl/4xDvY5TfhWieRIGGxOEQ5CJe0LDTvmuZHn7tvPcWhat ZFLc+hY9mWoSo3B5wrnOchLiFiIGah7FmDaHe/nxtWpJetC1R49VIZ1zqw0SL2j1GAVP6ysAbpTbq AN2xlKbIgeDPK4kj29NHs+8TgZfREK6nv9sDk1xM4afEaOS/XXWwv6CMeXZV2pdIZiLWdRWVfyfYV U9Eh9wFckxU+WRiSw1wQ6ynrPUVPqkXqtXgUPGzjyDmvFhy/kZrVmfi3hBnViLgR4ygGCsry0Q7D1 h06XZlEA==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lBl0U-00G3iz-SY; Mon, 15 Feb 2021 21:02:11 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Mike Rapoport , Vlastimil Babka Subject: [PATCH v2 2/6] mm/page_alloc: Rename gfp_mask to gfp Date: Mon, 15 Feb 2021 21:01:59 +0000 Message-Id: <20210215210203.3827513-3-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210215210203.3827513-1-willy@infradead.org> References: <20210215210203.3827513-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: Shorten some overly-long lines by renaming this identifier. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Vlastimil Babka --- mm/page_alloc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8100f9d123a8..9e4841ede0f4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4964,7 +4964,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_ma= sk, unsigned int order, * This is the 'heart' of the zoned buddy allocator. */ struct page * -__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred= _nid, +__alloc_pages_nodemask(gfp_t gfp, unsigned int order, int preferred_nid, nodemask_t *nodemask) { struct page *page; @@ -4977,13 +4977,13 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned i= nt order, int preferred_nid, * so bail out early if the request is out of bound. */ if (unlikely(order >=3D MAX_ORDER)) { - WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN)); + WARN_ON_ONCE(!(gfp & __GFP_NOWARN)); return NULL; } =20 - gfp_mask &=3D gfp_allowed_mask; - alloc_gfp =3D gfp_mask; - if (!prepare_alloc_pages(gfp_mask, order, preferred_nid, nodemask, &ac, + gfp &=3D gfp_allowed_mask; + alloc_gfp =3D gfp; + if (!prepare_alloc_pages(gfp, order, preferred_nid, nodemask, &ac, &alloc_gfp, &alloc_flags)) return NULL; =20 @@ -4991,7 +4991,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int= order, int preferred_nid, * Forbid the first pass from falling back to types that fragment * memory until all local zones are considered. */ - alloc_flags |=3D alloc_flags_nofragment(ac.preferred_zoneref->zone, gfp= _mask); + alloc_flags |=3D alloc_flags_nofragment(ac.preferred_zoneref->zone, gfp= ); =20 /* First allocation attempt */ page =3D get_page_from_freelist(alloc_gfp, order, alloc_flags, &ac); @@ -5004,7 +5004,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int= order, int preferred_nid, * from a particular context which has been marked by * memalloc_no{fs,io}_{save,restore}. */ - alloc_gfp =3D current_gfp_context(gfp_mask); + alloc_gfp =3D current_gfp_context(gfp); ac.spread_dirty_pages =3D false; =20 /* @@ -5016,8 +5016,8 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int= order, int preferred_nid, page =3D __alloc_pages_slowpath(alloc_gfp, order, &ac); =20 out: - if (memcg_kmem_enabled() && (gfp_mask & __GFP_ACCOUNT) && page && - unlikely(__memcg_kmem_charge_page(page, gfp_mask, order) !=3D 0)) { + if (memcg_kmem_enabled() && (gfp & __GFP_ACCOUNT) && page && + unlikely(__memcg_kmem_charge_page(page, gfp, order) !=3D 0)) { __free_pages(page, order); page =3D NULL; } --=20 2.29.2