From:   Yangtao Li <frank.li@vivo.com>
To:     Alexander Viro <viro@zeniv.linux.org.uk>,
        Christian Brauner <brauner@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Luis Chamberlain <mcgrof@kernel.org>,
        Kees Cook <keescook@chromium.org>,
        Iurii Zaikin <yzaikin@google.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH] fs/drop_caches: move drop_caches sysctls into its own file
Date:   Tue, 21 Mar 2023 21:09:07 +0800
Message-Id: <20230321130908.6972-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9y6C8ZUjFym7q/G+Ej/Wvly/rO8LLI4VmVJ1g/zwJj8ozxVrbzNeuBbIhZg/?=
 =?us-ascii?Q?/Ab0DMwqJq1QJjMFf+EtHqXxbLA5yc7XgBk+9GIj6UAKrVWYybMgWFgdwBJb?=
 =?us-ascii?Q?hTm5hKEFAqicd1VV/PPBt90vsbqudj/HI1rD8ICcR5N60PxapjZM9V9nwSHP?=
 =?us-ascii?Q?hnkxXoopIQpcqYb27RWSuluA2+KB9fJXNAQx/MS5V9dkCpzzFZ2I9jtRDm3w?=
 =?us-ascii?Q?fvdP6mBYLXhlpyouus10R6JDH5FlKpi/vcnv6TPDtfMnLUYDpBQOWZoNbE/a?=
 =?us-ascii?Q?bmpN8Wq4VAHWR87cLOBsZtrahdwC+xqFOH7Xr8Pts3A8cYJfVrDbEST9Vwde?=
 =?us-ascii?Q?AP/6+hwsSoI2nlK2EMo1HNX7fNSXzcOnZETgVZTD6mznyieUGGXqmMVzvnCc?=
 =?us-ascii?Q?99Sk2VWytDSks8Kwm3mnJhELOhaOgdQ2XSgog3VaAxXpBG3TeeAMs//Fr+ml?=
 =?us-ascii?Q?C5MWY4KMJaZ3X8H4NCAfFg+EWBwczPLFD/GwrKGgqUzEW+FAix2mc8xY/wNg?=
 =?us-ascii?Q?lkR7IVS2ZuXNM+w+n36UqPERBhfKq+VUOMluTcYqhSq7e/oM+ar5evut9gSy?=
 =?us-ascii?Q?j31ktaXERNu30QGzBBjsEFkZfMMBpNplB8rMssSX8680V+AecH4jJ/1FqplI?=
 =?us-ascii?Q?dezedT8mjzxBHVDIXRfkruY5EIYohaOXRFmfmanuThPVhZL/mBT7XEV8iUEB?=
 =?us-ascii?Q?NYBtPIeZRR59Iyn9PrhZuCFXH4vHCxtXUO3Vv0Ksdm2ZP7iEJMmB0gBk4Bk4?=
 =?us-ascii?Q?953eCRzKwEReXps9IMJ209btneTYqD8nzN6Rp/gGpV8LmnxskQx0HT+KW/PM?=
 =?us-ascii?Q?Mj1r8lHpXBuQELQiO/W6kxQgV1JF6oSoasJaAj+LFePS9oXah13haZKREcuL?=
 =?us-ascii?Q?jqakXtbchg9LXmsgQ7P18pxuOPOutcAMeUaJCIjNBYxoi8IUzfqfsDwh9Kra?=
 =?us-ascii?Q?4UkLzU1Y8eCuIfo2EM1SFptnWgzM1KZL+M1lk3kmvkTsBedXm6Ei8ipzo9AD?=
 =?us-ascii?Q?ZrgLQ5x/UJPxpw90fFusZGhgWvIxsiAAvBovUNU2NL1lSCW4ejs8NeiNR8jk?=
 =?us-ascii?Q?GWWoEPConl4JyDsuaRONVYkasaHKU+mjmS4c/c2vBLWSy8u7+YLdddrKRy5G?=
 =?us-ascii?Q?5H+byV8LPjF2bj3kB9K8rKN/SK3J4xSJfjSyw4kYD1U5px6vmrAGgUEbqTaE?=
 =?us-ascii?Q?FCpYSZY7Bk89m91uiR0lBEzitEwIBosPvys9iMvMu9aWXCzB4araOa260A1X?=
 =?us-ascii?Q?ISpNXzIxok488wG8ZYFf3KMQlrS9LgLMJk6L9gHa3rTCgbMWLPMd+Olj259J?=
 =?us-ascii?Q?eodiZYLyOKMOaUoSqEMKr/25GC9glqBW80N/4dAmXC3fJ6T85pb2OlKZu5l9?=
 =?us-ascii?Q?9Hu8DqZuSPO8WymNdyiwnS4HUYTsOKbQZIFHxjQbwOLqALshSP3Ps4s+yKDM?=
 =?us-ascii?Q?Ia4VJ+y4+W84VhpSjwU4BPJBNV2H8Gcp1GHZ16UjCmuVH6Gdmk+9oanz4eWv?=
 =?us-ascii?Q?y5tznbGvsol8MJjzrloORiQK1k9m7kQky8TSVCjc2d9U8DJjbj+o3XjG/6qU?=
 =?us-ascii?Q?tEnOGh0+s41vjw3gzaxJGOnqsFdBvhequnSq50XG?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e775e6e2-2308-4e1d-5c05-08db2a0d7f33
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2023 13:09:26.1789
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: i0U1Qi7/JfiftZdAJpCLxDMw2XzjCifzsjvnZSIWn78N8RkJXUy5TQDoFW6zzKDn635G1Ra9JtKZLCp4j2+j0w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5507
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This moves the fs/drop_caches.c respective sysctls to its own file.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/drop_caches.c   | 25 ++++++++++++++++++++++---
 include/linux/mm.h |  6 ------
 kernel/sysctl.c    |  9 ---------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/fs/drop_caches.c b/fs/drop_caches.c
index e619c31b6bd9..3032b83ce6f2 100644
--- a/fs/drop_caches.c
+++ b/fs/drop_caches.c
@@ -12,8 +12,7 @@
 #include <linux/gfp.h>
 #include "internal.h"
 
-/* A global variable is a bit ugly, but it keeps the code simple */
-int sysctl_drop_caches;
+static int sysctl_drop_caches;
 
 static void drop_pagecache_sb(struct super_block *sb, void *unused)
 {
@@ -47,7 +46,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused)
 	iput(toput_inode);
 }
 
-int drop_caches_sysctl_handler(struct ctl_table *table, int write,
+static int drop_caches_sysctl_handler(struct ctl_table *table, int write,
 		void *buffer, size_t *length, loff_t *ppos)
 {
 	int ret;
@@ -75,3 +74,23 @@ int drop_caches_sysctl_handler(struct ctl_table *table, int write,
 	}
 	return 0;
 }
+
+static struct ctl_table drop_caches_table[] = {
+	{
+		.procname	= "drop_caches",
+		.data		= &sysctl_drop_caches,
+		.maxlen		= sizeof(int),
+		.mode		= 0200,
+		.proc_handler	= drop_caches_sysctl_handler,
+		.extra1		= SYSCTL_ONE,
+		.extra2		= SYSCTL_FOUR,
+	},
+	{}
+};
+
+static int __init drop_cache_init(void)
+{
+	register_sysctl_init("vm", drop_caches_table);
+	return 0;
+}
+fs_initcall(drop_cache_init);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ee755bb4e1c1..1a5d9e8a41b5 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3513,12 +3513,6 @@ static inline int in_gate_area(struct mm_struct *mm, unsigned long addr)
 
 extern bool process_shares_mm(struct task_struct *p, struct mm_struct *mm);
 
-#ifdef CONFIG_SYSCTL
-extern int sysctl_drop_caches;
-int drop_caches_sysctl_handler(struct ctl_table *, int, void *, size_t *,
-		loff_t *);
-#endif
-
 void drop_slab(void);
 
 #ifndef CONFIG_MMU
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index ce0297acf97c..6cbae0f7d50f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2148,15 +2148,6 @@ static struct ctl_table vm_table[] = {
 		.mode		= 0644,
 		.proc_handler	= lowmem_reserve_ratio_sysctl_handler,
 	},
-	{
-		.procname	= "drop_caches",
-		.data		= &sysctl_drop_caches,
-		.maxlen		= sizeof(int),
-		.mode		= 0200,
-		.proc_handler	= drop_caches_sysctl_handler,
-		.extra1		= SYSCTL_ONE,
-		.extra2		= SYSCTL_FOUR,
-	},
 #ifdef CONFIG_COMPACTION
 	{
 		.procname	= "compact_memory",
-- 
2.35.1