From: Luis Chamberlain <mcgrof@kernel.org>
Date: Thu, 2 Mar 2023 20:46:09 +0000 (-0800)
Subject: md: simplify sysctl registration
X-Git-Tag: v6.4-rc1~111^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9adcf9d3d5c9ed6bb9d493b59594501f79ae3bed;p=tomoyo%2Ftomoyo-test1.git

md: simplify sysctl registration

register_sysctl_table() is a deprecated compatibility wrapper.
register_sysctl() can do the directory creation for you so just use
that.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Acked-by: Song Liu <song@kernel.org>
---

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 39e49e5d7182..0dc01f834b62 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -322,26 +322,6 @@ static struct ctl_table raid_table[] = {
 	{ }
 };
 
-static struct ctl_table raid_dir_table[] = {
-	{
-		.procname	= "raid",
-		.maxlen		= 0,
-		.mode		= S_IRUGO|S_IXUGO,
-		.child		= raid_table,
-	},
-	{ }
-};
-
-static struct ctl_table raid_root_table[] = {
-	{
-		.procname	= "dev",
-		.maxlen		= 0,
-		.mode		= 0555,
-		.child		= raid_dir_table,
-	},
-	{  }
-};
-
 static int start_readonly;
 
 /*
@@ -9649,7 +9629,7 @@ static int __init md_init(void)
 	mdp_major = ret;
 
 	register_reboot_notifier(&md_notifier);
-	raid_table_header = register_sysctl_table(raid_root_table);
+	raid_table_header = register_sysctl("dev/raid", raid_table);
 
 	md_geninit();
 	return 0;