diff options
author | Luis Chamberlain <mcgrof@kernel.org> | 2023-03-10 00:37:19 -0800 |
---|---|---|
committer | Luis Chamberlain <mcgrof@kernel.org> | 2023-03-20 22:39:04 -0700 |
commit | 02fb0e275142137e54e19733ea11a045589c7e39 (patch) | |
tree | ebfba13acf8634150b3317158fdbbc6237ace180 | |
parent | eb472aa0678fd03321093bffeb9c7fd7f5035844 (diff) | |
download | linux-next-02fb0e275142137e54e19733ea11a045589c7e39.tar.gz |
lockd: simplify two-level sysctl registration for nlm_sysctls
There is no need to declare two tables to just create directories,
this can be easily be done with a prefix path with register_sysctl().
Simplify this registration.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-rw-r--r-- | fs/lockd/svc.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 9a47303b2cba..bb94949bc223 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -510,24 +510,6 @@ static struct ctl_table nlm_sysctls[] = { { } }; -static struct ctl_table nlm_sysctl_dir[] = { - { - .procname = "nfs", - .mode = 0555, - .child = nlm_sysctls, - }, - { } -}; - -static struct ctl_table nlm_sysctl_root[] = { - { - .procname = "fs", - .mode = 0555, - .child = nlm_sysctl_dir, - }, - { } -}; - #endif /* CONFIG_SYSCTL */ /* @@ -644,7 +626,7 @@ static int __init init_nlm(void) #ifdef CONFIG_SYSCTL err = -ENOMEM; - nlm_sysctl_table = register_sysctl_table(nlm_sysctl_root); + nlm_sysctl_table = register_sysctl("fs/nfs", nlm_sysctls); if (nlm_sysctl_table == NULL) goto err_sysctl; #endif |