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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 095C4C433E0 for ; Wed, 3 Mar 2021 10:21:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 800FA601FF for ; Wed, 3 Mar 2021 10:21:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 800FA601FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0D4958D0151; Wed, 3 Mar 2021 05:21:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 05BBE8D0135; Wed, 3 Mar 2021 05:21:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E412E8D0151; Wed, 3 Mar 2021 05:21:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0163.hostedemail.com [216.40.44.163]) by kanga.kvack.org (Postfix) with ESMTP id C54E88D0135 for ; Wed, 3 Mar 2021 05:21:52 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8E01B181CCB0D for ; Wed, 3 Mar 2021 10:21:52 +0000 (UTC) X-FDA: 77878172064.12.E74AE7D Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf10.hostedemail.com (Postfix) with ESMTP id AC1AC407F8DF for ; Wed, 3 Mar 2021 10:21:50 +0000 (UTC) IronPort-SDR: y7S3APTsaQlhDIulyPPYcIrCU6MZexhNPKtXKu1UgzJki6OqpotV77eqMgENVTHOsEuINF7eaM Pfx3XwRFXD2w== X-IronPort-AV: E=McAfee;i="6000,8403,9911"; a="272162870" X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="272162870" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 02:21:50 -0800 IronPort-SDR: mJG94OlRdkB4bOUsyIwA11SZcy0cODpfW1CyOe98JK90aoacB/QL/yLrvQCmsUDfhKn3QBNid9 /4O9MP8Cdmlg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="445200397" Received: from shbuild999.sh.intel.com ([10.239.146.165]) by orsmga001.jf.intel.com with ESMTP; 03 Mar 2021 02:21:47 -0800 From: Feng Tang To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Michal Hocko , Andrea Arcangeli , David Rientjes , Mel Gorman , Mike Kravetz , Randy Dunlap , Vlastimil Babka , Dave Hansen , Ben Widawsky , Andi leen , Dan Williams , Feng Tang Subject: [PATCH v3 13/14] mem/mempolicy: unify mpol_new_preferred() and mpol_new_preferred_many() Date: Wed, 3 Mar 2021 18:20:57 +0800 Message-Id: <1614766858-90344-14-git-send-email-feng.tang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1614766858-90344-1-git-send-email-feng.tang@intel.com> References: <1614766858-90344-1-git-send-email-feng.tang@intel.com> X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: AC1AC407F8DF X-Stat-Signature: 31mk438yuzjkwj4rrfh3cneib9e6i458 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf10; identity=mailfrom; envelope-from=""; helo=mga05.intel.com; client-ip=192.55.52.43 X-HE-DKIM-Result: none/none X-HE-Tag: 1614766910-450544 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: To reduce some code duplication. Signed-off-by: Feng Tang --- mm/mempolicy.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 1438d58..d66c1c0 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -201,32 +201,21 @@ static int mpol_new_interleave(struct mempolicy *pol, const nodemask_t *nodes) return 0; } -static int mpol_new_preferred_many(struct mempolicy *pol, +/* cover both MPOL_PREFERRED and MPOL_PREFERRED_MANY */ +static int mpol_new_preferred(struct mempolicy *pol, const nodemask_t *nodes) { if (!nodes) pol->flags |= MPOL_F_LOCAL; /* local allocation */ else if (nodes_empty(*nodes)) return -EINVAL; /* no allowed nodes */ - else - pol->nodes = *nodes; - return 0; -} - -static int mpol_new_preferred(struct mempolicy *pol, const nodemask_t *nodes) -{ - if (nodes) { + else { /* MPOL_PREFERRED can only take a single node: */ - nodemask_t tmp; + nodemask_t tmp = nodemask_of_node(first_node(*nodes)); - if (nodes_empty(*nodes)) - return -EINVAL; - - tmp = nodemask_of_node(first_node(*nodes)); - return mpol_new_preferred_many(pol, &tmp); + pol->nodes = (pol->mode == MPOL_PREFERRED) ? tmp : *nodes; } - - return mpol_new_preferred_many(pol, NULL); + return 0; } static int mpol_new_bind(struct mempolicy *pol, const nodemask_t *nodes) @@ -468,7 +457,7 @@ static const struct mempolicy_operations mpol_ops[MPOL_MAX] = { }, /* [MPOL_LOCAL] - see mpol_new() */ [MPOL_PREFERRED_MANY] = { - .create = mpol_new_preferred_many, + .create = mpol_new_preferred, .rebind = mpol_rebind_preferred_many, }, }; -- 2.7.4