From nobody Tue Feb 10 09:57:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70DBDCA0EC7 for ; Mon, 11 Sep 2023 22:45:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357531AbjIKWFn (ORCPT ); Mon, 11 Sep 2023 18:05:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236130AbjIKJv1 (ORCPT ); Mon, 11 Sep 2023 05:51:27 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DF02E44 for ; Mon, 11 Sep 2023 02:51:22 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-569612f9d89so233102a12.0 for ; Mon, 11 Sep 2023 02:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1694425882; x=1695030682; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uv0TBZQkv9+j+cj13JOsDOVxquETdMy4ZuA8JAVbwFY=; b=YRRfnI9+VRJJTgeAFY/PXL07id3mMmoEVGPQCPpNE/SK6YzpPCphxeCFbdG0M9Uxe1 IX14kV5lXoTEHgsVmQ6Azpu+HTkoEkv/19ixResLBXrxa0Av4SD5GW7urOHRzXkZDkYZ GxBWHMMr1jRkxtFxeWt92U5dEag1e/mI0LQGT9tRhWGXGtcJ7ervljxZ1nMZlQBqv0fd pjaRCDJTYfTEMXJffAkefYCJwJzgDPYRSmpU7eAMHs7XvL8IcUvHQM+ItEpPh0HRzOMw auJLJ73xb6ov3ZafP7dhUYBi64xbfrn9L0ZLAR8kBn6ZptC3BzHbXiuEonS78l+a3D8P cWYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694425882; x=1695030682; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uv0TBZQkv9+j+cj13JOsDOVxquETdMy4ZuA8JAVbwFY=; b=V/AgQY79z3wwU0Ca6NLaQlqBclq/e2FtHV4Mx9YfoIDzrFlHHBDagVJbOi1qWueGXC rxwBPuFpKdS2Lpgz2tb2BeAgfdq4Yo6sWiTxm7+L/7rLK+Oqf7pS4gZS09X0OfuzJXeC BohQtRTSOCsKEvKYf4+GusmSD/+bqmPsSGptybg6ftI+olBWQ/aDns5ed93VLwas4hGN /O7u3y2bZPGE/74TcifqJqhW2SrQSacwN8okJ5YCO3D3E7IqNVP3PDqhOOUEviuDvsBD tkSPbGgCTwKdCu81ms6KlXd7CKb6zepi1uei8H2g9AZdcmaD2ImE+3pUrah10QowcPHV /9oA== X-Gm-Message-State: AOJu0Yx3gdovU2VzIKozXWjKblpRGua6nWTLBZR9OaR31c6ABPkH+DJq 7KgTuk2ReJcSTIpXG4pYYDm/lQ== X-Google-Smtp-Source: AGHT+IGKTvJsG+anhHgOhq4RXbEUzLj3hzjixmIPwpl+H2L5Yrr+lM0cdITBVAyo+CVp3tsEVeU2xg== X-Received: by 2002:a05:6a20:a10c:b0:13f:9233:58d with SMTP id q12-20020a056a20a10c00b0013f9233058dmr11709606pzk.2.1694425882074; Mon, 11 Sep 2023 02:51:22 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id az7-20020a170902a58700b001bdc2fdcf7esm5988188plb.129.2023.09.11.02.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 02:51:21 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Qi Zheng Subject: [PATCH v6 41/45] mm: shrinker: rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}() Date: Mon, 11 Sep 2023 17:44:40 +0800 Message-Id: <20230911094444.68966-42-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230911094444.68966-1-zhengqi.arch@bytedance.com> References: <20230911094444.68966-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" With the new shrinker APIs, there is no action such as prealloc, so rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}(), which corresponds to the idr_{alloc|remove}() inside the function. Signed-off-by: Qi Zheng --- mm/shrinker.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/shrinker.c b/mm/shrinker.c index 6723a8f4228c..0b9a43ce2d6f 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -209,7 +209,7 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int nid= , int shrinker_id) =20 static DEFINE_IDR(shrinker_idr); =20 -static int prealloc_memcg_shrinker(struct shrinker *shrinker) +static int shrinker_memcg_alloc(struct shrinker *shrinker) { int id, ret =3D -ENOMEM; =20 @@ -235,7 +235,7 @@ static int prealloc_memcg_shrinker(struct shrinker *shr= inker) return ret; } =20 -static void unregister_memcg_shrinker(struct shrinker *shrinker) +static void shrinker_memcg_remove(struct shrinker *shrinker) { int id =3D shrinker->id; =20 @@ -297,12 +297,12 @@ void reparent_shrinker_deferred(struct mem_cgroup *me= mcg) up_read(&shrinker_rwsem); } #else -static int prealloc_memcg_shrinker(struct shrinker *shrinker) +static int shrinker_memcg_alloc(struct shrinker *shrinker) { return -ENOSYS; } =20 -static void unregister_memcg_shrinker(struct shrinker *shrinker) +static void shrinker_memcg_remove(struct shrinker *shrinker) { } =20 @@ -628,7 +628,7 @@ struct shrinker *shrinker_alloc(unsigned int flags, con= st char *fmt, ...) shrinker->seeks =3D DEFAULT_SEEKS; =20 if (flags & SHRINKER_MEMCG_AWARE) { - err =3D prealloc_memcg_shrinker(shrinker); + err =3D shrinker_memcg_alloc(shrinker); if (err =3D=3D -ENOSYS) shrinker->flags &=3D ~SHRINKER_MEMCG_AWARE; else if (err =3D=3D 0) @@ -696,7 +696,7 @@ void shrinker_free(struct shrinker *shrinker) } =20 if (shrinker->flags & SHRINKER_MEMCG_AWARE) - unregister_memcg_shrinker(shrinker); + shrinker_memcg_remove(shrinker); up_write(&shrinker_rwsem); =20 if (debugfs_entry) --=20 2.30.2