Commit 1238c8b9 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Eric Biggers
Browse files

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: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20230302202826.776286-10-mcgrof@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 8b7d3fe9

fs/verity/signature.c

+1 −8
Original line number Diff line number Diff line
@@ -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;