fs-verity: simplify sysctls with register_sysctl()

register_sysctl_paths() is only needed if your child (directories) have
entries but this does not so just use register_sysctl() so to do away
with the path specification.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20230302202826.776286-10-mcgrof@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/fs/verity/signature.c b/fs/verity/signature.c
index e7d3ca919a1e0554c92c1ffb8adea0b8cfefc4fa..b8c51ad40d3a3a81fb53444dcfc2a4e8dd84fdbc 100644 (file)
--- a/fs/verity/signature.c
+++ b/fs/verity/signature.c
@@ -88,12 +88,6 @@ int fsverity_verify_signature(const struct fsverity_info *vi,
 #ifdef CONFIG_SYSCTL
 static struct ctl_table_header *fsverity_sysctl_header;
 
-static const struct ctl_path fsverity_sysctl_path[] = {
-       { .procname = "fs", },
-       { .procname = "verity", },
-       { }
-};
-
 static struct ctl_table fsverity_sysctl_table[] = {
        {
                .procname       = "require_signatures",
@@ -109,8 +103,7 @@ static struct ctl_table fsverity_sysctl_table[] = {
 
 static int __init fsverity_sysctl_init(void)
 {
-       fsverity_sysctl_header = register_sysctl_paths(fsverity_sysctl_path,
-                                                      fsverity_sysctl_table);
+       fsverity_sysctl_header = register_sysctl("fs/verity", fsverity_sysctl_table);
        if (!fsverity_sysctl_header) {
                pr_err("sysctl registration failed!\n");
                return -ENOMEM;