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=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 3BE7CC43461 for ; Wed, 16 Sep 2020 11:02:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C14EA2076D for ; Wed, 16 Sep 2020 11:02:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ODUZML88" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C14EA2076D 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 0749A6B0062; Wed, 16 Sep 2020 07:02:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F40268E0001; Wed, 16 Sep 2020 07:02:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E06936B006C; Wed, 16 Sep 2020 07:02:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0237.hostedemail.com [216.40.44.237]) by kanga.kvack.org (Postfix) with ESMTP id C3B5E6B0062 for ; Wed, 16 Sep 2020 07:02:05 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 7E7103638 for ; Wed, 16 Sep 2020 11:02:05 +0000 (UTC) X-FDA: 77268635010.09.neck26_3f11b5627119 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 56E10180AD80F for ; Wed, 16 Sep 2020 11:02:05 +0000 (UTC) X-HE-Tag: neck26_3f11b5627119 X-Filterd-Recvd-Size: 4493 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Sep 2020 11:02:04 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id y11so6501628lfl.5 for ; Wed, 16 Sep 2020 04:02:04 -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:mime-version :content-transfer-encoding; bh=JA4PHlNQaMJ1D5IFW/tpkL4nmImFR/EKeGxTzWjK4EI=; b=ODUZML88Dx0iFsSm8FrYDDW66yeAdO8HE2aG/UmGH0c1bKotJoVG+cm6HaJyIk7uwW QkW/oHj28CFkcu3AhajMu3oiBxKfntVt39vel8tM4xp9aFPT3D2SXxXTct/f+QqVtuko puOEDeIHtDZL5T6vyyIz6TRrpNAusDLKzI8vjfNLlQNmEM58OLSqX+EdsrY6n39Y+iz8 tl1curU5w3BCKu1xx0bzMdhfUcNstadkqswhgtS1Z3fgFSMZGs/px4HPeAj9Q/oOkpw6 JhVSGJeWp0+/b5k5IwzdPi9kH2ZnZ4iwaOnVa2tFcBCRI3NpNauXeEx/lRgC5BIMPyYT MPvg== 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:mime-version :content-transfer-encoding; bh=JA4PHlNQaMJ1D5IFW/tpkL4nmImFR/EKeGxTzWjK4EI=; b=iWUIu3eAP+LwdCMV984Tud1ivIgRGNFh14ghfl46EQimNog8bh9OKbx5Vv7JP5iw7s Qa1wKdMoToLTV5gXLNPlw7xXxFta8rIZyUtlaEUp4NgxJLT6FUgJxHgxLH6jiCMCWmu0 UBSHfKy6V4jY1X+TKCnEDOAa2y5v2khPWbOgTN9GXnySfn9ANmFwF+xciOVV0UeLjH/G mBNrfYCwLKA2d1Nl0OBxRQXT7bjX+ZpO/DGlrg231OG3Gwk2y1zOmr1IyMq6/cfEsBd4 7ymmZaCIEoBlkc3KvABwE2Oyx6Ah0gsXc5P9e8ZJJADYiDXDHbETAq7ZhFAsuP4DF27Q V1Hg== X-Gm-Message-State: AOAM5339xszMlswxohljcAhQ+M2zqULBATi9lR7NWcuwPUkI1PMK4Pv/ qub+N6OQq8ek5ycA4WU51+N5wEW56oBqtg== X-Google-Smtp-Source: ABdhPJxFfk/ocTjF6hPh2Z4/NvFWvbfmyK1pNp8DIIQwJT2EmJCJq8sPR6c0kOzYbBsGffbVLrKdSA== X-Received: by 2002:a19:8386:: with SMTP id f128mr6932052lfd.78.1600254122843; Wed, 16 Sep 2020 04:02:02 -0700 (PDT) Received: from localhost.localdomain (188.147.112.12.nat.umts.dynamic.t-mobile.pl. [188.147.112.12]) by smtp.gmail.com with ESMTPSA id 82sm4475792lfk.216.2020.09.16.04.02.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 04:02:02 -0700 (PDT) From: mateusznosek0@gmail.com To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Mateusz Nosek , akpm@linux-foundation.org Subject: [RFC PATCH] mm/page_alloc.c: clean code by merging two functions Date: Wed, 16 Sep 2020 13:01:18 +0200 Message-Id: <20200916110118.6537-1-mateusznosek0@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 56E10180AD80F X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Mateusz Nosek The 'finalise_ac' function is just 'epilogue' for 'prepare_alloc_pages'. Therefore there is no need to keep them both so 'finalise_ac' content can be merged into 'prepare_alloc_pages' code. It would make '__alloc_pages_nodemask' cleaner when it comes to readability. Signed-off-by: Mateusz Nosek --- mm/page_alloc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b9bd75cacf02..a094e297c88f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4824,12 +4824,6 @@ static inline bool prepare_alloc_pages(gfp_t gfp_m= ask, unsigned int order, =20 *alloc_flags =3D current_alloc_flags(gfp_mask, *alloc_flags); =20 - return true; -} - -/* Determine whether to spread dirty pages and what the first usable zon= e */ -static inline void finalise_ac(gfp_t gfp_mask, struct alloc_context *ac) -{ /* Dirty zone balancing only done in the fast path */ ac->spread_dirty_pages =3D (gfp_mask & __GFP_WRITE); =20 @@ -4840,6 +4834,8 @@ static inline void finalise_ac(gfp_t gfp_mask, stru= ct alloc_context *ac) */ ac->preferred_zoneref =3D first_zones_zonelist(ac->zonelist, ac->highest_zoneidx, ac->nodemask); + + return true; } =20 /* @@ -4868,8 +4864,6 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int= order, int preferred_nid, if (!prepare_alloc_pages(gfp_mask, order, preferred_nid, nodemask, &ac,= &alloc_mask, &alloc_flags)) return NULL; =20 - finalise_ac(gfp_mask, &ac); - /* * Forbid the first pass from falling back to types that fragment * memory until all local zones are considered. --=20 2.20.1