From patchwork Tue Nov 7 13:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados via B4 Relay X-Patchwork-Id: 13448713 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1E6330D03; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jteEPtHI" Received: by smtp.kernel.org (Postfix) with ESMTPS id 76D08C433C8; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699364686; bh=jp5zupYC3dqga+xgTeyhYepRQqFBsm6KYR9/rvlBnN0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=jteEPtHIs7oAmJr7WInd7m30GfZ3+4YOC7SdOkBiKWXaNYrkebAR9Qw9S20TrciIE +iRJWBmeeD6H4E6Q0UGLCOHUSZPQKR+ilHqofBw0pECe3YuXPN4n3T9LQK+Exg9yVi uUHPHnc7KFA754RGOn4/y3TBRY4aqg0D04JTxg3j3OquVgbec1cFP0iEDt+rN+3ClT FSDI9AfK9PnF9RPehD0CN90FIOsHCa6yTryGLJPb5vvfzlCsF1dyKyKLm8pZHB7eIs TuRcvvyJJCXvglvGlTiWBNHPpG/9UxXE/Uc/01v8JHju0okDPMW+snpyk9bUq56tVO NDvvV/UHanIQA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 549B9C4167D; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) From: Joel Granados via B4 Relay Date: Tue, 07 Nov 2023 14:44:20 +0100 Subject: [PATCH 1/4] cachefiles: Remove the now superfluous sentinel element from ctl_table array Precedence: bulk X-Mailing-List: fsverity@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231107-jag-sysctl_remove_empty_elem_fs-v1-1-7176632fea9f@samsung.com> References: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> In-Reply-To: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> To: Luis Chamberlain , willy@infradead.org, josh@joshtriplett.org, Kees Cook , David Howells , Alexander Viro , Christian Brauner , Benjamin LaHaise , Eric Biederman , Trond Myklebust , Anna Schumaker , Chuck Lever , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jan Kara , Amir Goldstein , Matthew Bobrowski , Anton Altaparmakov , Namjae Jeon , Mark Fasheh , Joel Becker , Joseph Qi , Iurii Zaikin , Eric Biggers , "Theodore Y. Ts'o" , Chandan Babu R , "Darrick J. Wong" , Jan Harkes , coda@cs.cmu.edu Cc: linux-cachefs@redhat.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ocfs2-devel@lists.linux.dev, fsverity@lists.linux.dev, linux-xfs@vger.kernel.org, codalist@coda.cs.cmu.edu, Joel Granados X-Mailer: b4 0.13-dev-86aa5 X-Developer-Signature: v=1; a=openpgp-sha256; l=923; i=j.granados@samsung.com; h=from:subject:message-id; bh=SGTnhgVPbRkVEntdcKFq1I6E3blB6PSwrb9JaawnFFQ=; b=owEB7QES/pANAwAKAbqXzVK3lkFPAcsmYgBlSj9M2ig+1rzDK3f26PkGfrXWs+L3sZHbcxuLZ iLSqjCt04yJAbMEAAEKAB0WIQSuRwlXJeYxJc7LJ5C6l81St5ZBTwUCZUo/TAAKCRC6l81St5ZB TyqTC/9Uoc1Mimxa39eNT1hPi8AUMLHAwsLHAs/0Njg/O4yNK+y9soM5dgjUElmwbiilSzCoF96 KOrLzOVWdrT8x5EiJajBmIczrpnvFo2XR1q59Tdg8+dVfzfdBKf9810BUXm22LDrhR5GCrfUjIe WI/w8QEvhxTRKvMJ5RUVl2jeeid8nF4ujb09LKlQMcj8mWT2+Dky7Y7C1J+AYI6fUSkT1SYRCGh ffoxN9L3S8Z/p3QRid2gFhunhJR3srSt3zGaLSwjJ/uQem0RFk0bHeGNq6mtq7H9PGnx7WrBq2Q X38P2PTXPDPOJW1aJJo3JV4J6I9ZJXvvc9ICJ3Wwd4yjd6sC199Oyu5j8fs9zXXlGKMoJbR+6Ua U//6ZueugQgAELb5QYH2rbjFeKAdSEJMotieMRJX/EXowVpmwUtie1sugGTqE0lBeQj7YcSl0It omT8aMtMmJ7/fay2nrRV3e63CCMFfc9EOjGkjEX1MMFnzzyQv14byTNJhE303H6qq5M4A= X-Developer-Key: i=j.granados@samsung.com; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for j.granados@samsung.com/default with auth_id=70 X-Original-From: Joel Granados Reply-To: From: Joel Granados This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) Remove sentinel from cachefiles_sysctls Signed-off-by: Joel Granados --- fs/cachefiles/error_inject.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/cachefiles/error_inject.c b/fs/cachefiles/error_inject.c index 18de8a876b02..1715d5ca2b2d 100644 --- a/fs/cachefiles/error_inject.c +++ b/fs/cachefiles/error_inject.c @@ -19,7 +19,6 @@ static struct ctl_table cachefiles_sysctls[] = { .mode = 0644, .proc_handler = proc_douintvec, }, - {} }; int __init cachefiles_register_error_injection(void) From patchwork Tue Nov 7 13:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados via B4 Relay X-Patchwork-Id: 13448711 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFE2030CF3; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aEVfle01" Received: by smtp.kernel.org (Postfix) with ESMTPS id 85995C433CA; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699364686; bh=rxWCD86XNSuDAvBsfXLMERxDl1CKS+dH3af8HBg07kQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=aEVfle01ejHZcEGy0MVOzTlRZzwhHmFN2WCj4tqs0IV6KaIl/4vdxJJ3CtdAMFSo9 ltgl9iZCMmHdYd83TSsvv1Y/mGTOA4NOQwb0Hr4uAZrV+mbeNzTabxUdy/SU1T9GmX G+gWtuNOX7WD42yuq2Ekc1tWhYP3QfVMageHceT+wgbEHT1WiM+tVyVonFHZ9P/SsC EgprqyqsRJGa5m0dy2z5n2NBKqk7RgMaNvk6oGz3zMXAoRwT8/PJT5ofzghCcUAlRL I5mHaobYC1u/yMpTM9v/zFJvtM5RVz2M6itXaJlsbq8H5ah6KmV3kUPgN/kDYVBEW/ 2zg+d9ZUYuRcg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 674A3C41535; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) From: Joel Granados via B4 Relay Date: Tue, 07 Nov 2023 14:44:21 +0100 Subject: [PATCH 2/4] aio: Remove the now superfluous sentinel elements from ctl_table array Precedence: bulk X-Mailing-List: fsverity@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231107-jag-sysctl_remove_empty_elem_fs-v1-2-7176632fea9f@samsung.com> References: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> In-Reply-To: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> To: Luis Chamberlain , willy@infradead.org, josh@joshtriplett.org, Kees Cook , David Howells , Alexander Viro , Christian Brauner , Benjamin LaHaise , Eric Biederman , Trond Myklebust , Anna Schumaker , Chuck Lever , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jan Kara , Amir Goldstein , Matthew Bobrowski , Anton Altaparmakov , Namjae Jeon , Mark Fasheh , Joel Becker , Joseph Qi , Iurii Zaikin , Eric Biggers , "Theodore Y. Ts'o" , Chandan Babu R , "Darrick J. Wong" , Jan Harkes , coda@cs.cmu.edu Cc: linux-cachefs@redhat.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ocfs2-devel@lists.linux.dev, fsverity@lists.linux.dev, linux-xfs@vger.kernel.org, codalist@coda.cs.cmu.edu, Joel Granados X-Mailer: b4 0.13-dev-86aa5 X-Developer-Signature: v=1; a=openpgp-sha256; l=11575; i=j.granados@samsung.com; h=from:subject:message-id; bh=Bp4t+hG4KxriN9ysmR+FNphfogz/Zbj5hCur76JNJk4=; b=owEB7QES/pANAwAKAbqXzVK3lkFPAcsmYgBlSj9M0gQQGdSO41F/tFzCNJiybCW5DpRQbuKa+ 3ea3SYJrneJAbMEAAEKAB0WIQSuRwlXJeYxJc7LJ5C6l81St5ZBTwUCZUo/TAAKCRC6l81St5ZB T/0OC/9NF1yUjynIukW4xr4twuJ6RJ7ZlhvpJGC6JFQ/ZnDqy/dY+psj3a4/wijg0cE2EPQ4VaJ fQyJD54QGHossklBLCKorZRgt9JPVw9KyJNYgppTSckcQHKOwF8AOODgWcdZ+RrYaLhf5HGXtZy y2QHvaR0ohmk/HLtyfg03UWXL4DyFtgFx6YdRWY638ntmc/xy9Wd8uRdKojRTMObLLwN1qHA77L IjnrJAJhSB4lmPBWm9ltGGjq72j5T9fk/1Za7uRO0IKviticlarAPXVIdG+GfEls2+aBT4/WKrZ ebNPqsZi0hoG3pDB4Pgrphn2H1NmY5rMpsiNPbQHPNeoukza+Adxpp+goAD5bCQeaiKknjKUU+E iNiuC8knteEAjr8rPMclNDZ9CmwWMsnOT/41BRAk64HXWI1GbBK6ZAZndd7CWScYNXOP+3pATcq yUiolFbUN81q008Dai2JW3lBWAifZMid5PNbu5Lw7ouLwTy4kxS8//ZHDjr0Utld25CQM= X-Developer-Key: i=j.granados@samsung.com; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for j.granados@samsung.com/default with auth_id=70 X-Original-From: Joel Granados Reply-To: From: Joel Granados This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) Remove sentinel elements ctl_table struct. Special attention was placed in making sure that an empty directory for fs/verity was created when CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not defined. In this case we use the register sysctl call that expects a size. Signed-off-by: Joel Granados Reviewed-by: Darrick J. Wong Reviewed-by: Jan Kara --- fs/aio.c | 1 - fs/coredump.c | 1 - fs/dcache.c | 1 - fs/devpts/inode.c | 1 - fs/eventpoll.c | 1 - fs/exec.c | 1 - fs/file_table.c | 1 - fs/inode.c | 1 - fs/lockd/svc.c | 1 - fs/locks.c | 1 - fs/namei.c | 1 - fs/namespace.c | 1 - fs/nfs/nfs4sysctl.c | 1 - fs/nfs/sysctl.c | 1 - fs/notify/dnotify/dnotify.c | 1 - fs/notify/fanotify/fanotify_user.c | 1 - fs/notify/inotify/inotify_user.c | 1 - fs/ntfs/sysctl.c | 1 - fs/ocfs2/stackglue.c | 1 - fs/pipe.c | 1 - fs/proc/proc_sysctl.c | 1 - fs/quota/dquot.c | 1 - fs/sysctls.c | 1 - fs/userfaultfd.c | 1 - fs/verity/fsverity_private.h | 2 +- fs/verity/init.c | 8 +++++--- fs/xfs/xfs_sysctl.c | 2 -- 27 files changed, 6 insertions(+), 30 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index a4c2a6bac72c..da069d6b6c66 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -239,7 +239,6 @@ static struct ctl_table aio_sysctls[] = { .mode = 0644, .proc_handler = proc_doulongvec_minmax, }, - {} }; static void __init aio_sysctl_init(void) diff --git a/fs/coredump.c b/fs/coredump.c index 9d235fa14ab9..f258c17c1841 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -981,7 +981,6 @@ static struct ctl_table coredump_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; static int __init init_fs_coredump_sysctls(void) diff --git a/fs/dcache.c b/fs/dcache.c index 25ac74d30bff..bafdd455b0fe 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -191,7 +191,6 @@ static struct ctl_table fs_dcache_sysctls[] = { .mode = 0444, .proc_handler = proc_nr_dentry, }, - { } }; static int __init init_fs_dcache_sysctls(void) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 299c295a27a0..a4de1612b1db 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -69,7 +69,6 @@ static struct ctl_table pty_table[] = { .data = &pty_count, .proc_handler = proc_dointvec, }, - {} }; struct pts_mount_opts { diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1d9a71a0c4c1..975fc5623102 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -322,7 +322,6 @@ static struct ctl_table epoll_table[] = { .extra1 = &long_zero, .extra2 = &long_max, }, - { } }; static void __init epoll_sysctls_init(void) diff --git a/fs/exec.c b/fs/exec.c index 6518e33ea813..7a18bde22f25 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -2167,7 +2167,6 @@ static struct ctl_table fs_exec_sysctls[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_TWO, }, - { } }; static int __init init_fs_exec_sysctls(void) diff --git a/fs/file_table.c b/fs/file_table.c index ee21b3da9d08..544f7d4f166f 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -137,7 +137,6 @@ static struct ctl_table fs_stat_sysctls[] = { .extra1 = &sysctl_nr_open_min, .extra2 = &sysctl_nr_open_max, }, - { } }; static int __init init_fs_stat_sysctls(void) diff --git a/fs/inode.c b/fs/inode.c index 35fd688168c5..ce16e3cda7bf 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -129,7 +129,6 @@ static struct ctl_table inodes_sysctls[] = { .mode = 0444, .proc_handler = proc_nr_inodes, }, - { } }; static int __init init_fs_inode_sysctls(void) diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 6579948070a4..f784ff58bfd3 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -474,7 +474,6 @@ static struct ctl_table nlm_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; #endif /* CONFIG_SYSCTL */ diff --git a/fs/locks.c b/fs/locks.c index 76ad05f8070a..6ecfc422fb37 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -111,7 +111,6 @@ static struct ctl_table locks_sysctls[] = { .proc_handler = proc_dointvec, }, #endif /* CONFIG_MMU */ - {} }; static int __init init_fs_locks_sysctls(void) diff --git a/fs/namei.c b/fs/namei.c index 567ee547492b..fb552161c981 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1070,7 +1070,6 @@ static struct ctl_table namei_sysctls[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_TWO, }, - { } }; static int __init init_fs_namei_sysctls(void) diff --git a/fs/namespace.c b/fs/namespace.c index e157efc54023..e95d4328539d 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -5008,7 +5008,6 @@ static struct ctl_table fs_namespace_sysctls[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ONE, }, - { } }; static int __init init_fs_namespace_sysctls(void) diff --git a/fs/nfs/nfs4sysctl.c b/fs/nfs/nfs4sysctl.c index e776200e9a11..886a7c4c60b3 100644 --- a/fs/nfs/nfs4sysctl.c +++ b/fs/nfs/nfs4sysctl.c @@ -34,7 +34,6 @@ static struct ctl_table nfs4_cb_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; int nfs4_register_sysctl(void) diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index f39e2089bc4c..e645be1a3381 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c @@ -29,7 +29,6 @@ static struct ctl_table nfs_cb_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; int nfs_register_sysctl(void) diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c index ebdcc25df0f7..8151ed5ddefc 100644 --- a/fs/notify/dnotify/dnotify.c +++ b/fs/notify/dnotify/dnotify.c @@ -29,7 +29,6 @@ static struct ctl_table dnotify_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - {} }; static void __init dnotify_sysctl_init(void) { diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index f69c451018e3..80539839af0c 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -86,7 +86,6 @@ static struct ctl_table fanotify_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO }, - { } }; static void __init fanotify_sysctls_init(void) diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 1c4bfdab008d..3e222a271da6 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -85,7 +85,6 @@ static struct ctl_table inotify_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO }, - { } }; static void __init inotify_sysctls_init(void) diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c index 174fe536a1c0..4e980170d86a 100644 --- a/fs/ntfs/sysctl.c +++ b/fs/ntfs/sysctl.c @@ -28,7 +28,6 @@ static struct ctl_table ntfs_sysctls[] = { .mode = 0644, /* Mode, proc handler. */ .proc_handler = proc_dointvec }, - {} }; /* Storage for the sysctls header. */ diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index a8d5ca98fa57..20aa37b67cfb 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c @@ -658,7 +658,6 @@ static struct ctl_table ocfs2_nm_table[] = { .mode = 0644, .proc_handler = proc_dostring, }, - { } }; static struct ctl_table_header *ocfs2_table_header; diff --git a/fs/pipe.c b/fs/pipe.c index 6c1a9b1db907..6bc1c4ae81d5 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -1492,7 +1492,6 @@ static struct ctl_table fs_pipe_sysctls[] = { .mode = 0644, .proc_handler = proc_doulongvec_minmax, }, - { } }; #endif diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index de484195f49f..4e06c4d69906 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -71,7 +71,6 @@ static struct ctl_table root_table[] = { .procname = "", .mode = S_IFDIR|S_IRUGO|S_IXUGO, }, - { } }; static struct ctl_table_root sysctl_table_root = { .default_set.dir.header = { diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 9e72bfe8bbad..69b03e13e6f2 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2949,7 +2949,6 @@ static struct ctl_table fs_dqstats_table[] = { .proc_handler = proc_dointvec, }, #endif - { }, }; static int __init dquot_init(void) diff --git a/fs/sysctls.c b/fs/sysctls.c index 76a0aee8c229..8dbde9a802fa 100644 --- a/fs/sysctls.c +++ b/fs/sysctls.c @@ -26,7 +26,6 @@ static struct ctl_table fs_shared_sysctls[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_MAXOLDUID, }, - { } }; static int __init init_fs_sysctls(void) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 56eaae9dac1a..7668285779c1 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -45,7 +45,6 @@ static struct ctl_table vm_userfaultfd_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, - { } }; #endif diff --git a/fs/verity/fsverity_private.h b/fs/verity/fsverity_private.h index d071a6e32581..8191bf7ad706 100644 --- a/fs/verity/fsverity_private.h +++ b/fs/verity/fsverity_private.h @@ -122,8 +122,8 @@ void __init fsverity_init_info_cache(void); /* signature.c */ -#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES extern int fsverity_require_signatures; +#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES int fsverity_verify_signature(const struct fsverity_info *vi, const u8 *signature, size_t sig_size); diff --git a/fs/verity/init.c b/fs/verity/init.c index a29f062f6047..e31045dd4f6c 100644 --- a/fs/verity/init.c +++ b/fs/verity/init.c @@ -13,7 +13,6 @@ static struct ctl_table_header *fsverity_sysctl_header; static struct ctl_table fsverity_sysctl_table[] = { -#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES { .procname = "require_signatures", .data = &fsverity_require_signatures, @@ -23,14 +22,17 @@ static struct ctl_table fsverity_sysctl_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, -#endif - { } }; static void __init fsverity_init_sysctl(void) { +#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES fsverity_sysctl_header = register_sysctl("fs/verity", fsverity_sysctl_table); +#else + fsverity_sysctl_header = register_sysctl_sz("fs/verity", + fsverity_sysctl_table, 0); +#endif if (!fsverity_sysctl_header) panic("fsverity sysctl registration failed"); } diff --git a/fs/xfs/xfs_sysctl.c b/fs/xfs/xfs_sysctl.c index fade33735393..a191f6560f98 100644 --- a/fs/xfs/xfs_sysctl.c +++ b/fs/xfs/xfs_sysctl.c @@ -206,8 +206,6 @@ static struct ctl_table xfs_table[] = { .extra2 = &xfs_params.stats_clear.max }, #endif /* CONFIG_PROC_FS */ - - {} }; int From patchwork Tue Nov 7 13:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados via B4 Relay X-Patchwork-Id: 13448710 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB9B21EB44; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oFTJ5WLB" Received: by smtp.kernel.org (Postfix) with ESMTPS id 936E0C4339A; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699364686; bh=Xj/qeNJ1fWTZ5t8tG8CiKkqyjuOspbgdeEVbMKEatVA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=oFTJ5WLB7vlFQRcquJ5uh9QbuamVM8WKMIV/pw4Xd8rfT0VxGp+9nySvqMUfIT85k jeZzDs7dDrDim5hsFqidsuy7UIvV4+jJ8yJeFGlLV83K7sDhPAon3CEgZJe28WiXU/ LCCN6o2VK85ipkpLoSjRiVG2tzpPv+FOSrsO4eRFSJoUoW7g7aTr0WMK1wrFzoVIf5 eUzraECuGYMnOa6MdeEofoNcsrUFgxtcDEMxuGxEZdMd8h2zRy59/0RLFbWB8FzaES /8eIG/5UkIkvcZK0M9b80kKzZcpJGZWOqfOTinUOONpBFnwDeWlR8PZXMrAKgx/LlP VeXIYRw5LcYvQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77B0FC4167B; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) From: Joel Granados via B4 Relay Date: Tue, 07 Nov 2023 14:44:22 +0100 Subject: [PATCH 3/4] sysctl: Remove the now superfluous sentinel elements from ctl_table array Precedence: bulk X-Mailing-List: fsverity@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231107-jag-sysctl_remove_empty_elem_fs-v1-3-7176632fea9f@samsung.com> References: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> In-Reply-To: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> To: Luis Chamberlain , willy@infradead.org, josh@joshtriplett.org, Kees Cook , David Howells , Alexander Viro , Christian Brauner , Benjamin LaHaise , Eric Biederman , Trond Myklebust , Anna Schumaker , Chuck Lever , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jan Kara , Amir Goldstein , Matthew Bobrowski , Anton Altaparmakov , Namjae Jeon , Mark Fasheh , Joel Becker , Joseph Qi , Iurii Zaikin , Eric Biggers , "Theodore Y. Ts'o" , Chandan Babu R , "Darrick J. Wong" , Jan Harkes , coda@cs.cmu.edu Cc: linux-cachefs@redhat.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ocfs2-devel@lists.linux.dev, fsverity@lists.linux.dev, linux-xfs@vger.kernel.org, codalist@coda.cs.cmu.edu, Joel Granados X-Mailer: b4 0.13-dev-86aa5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1106; i=j.granados@samsung.com; h=from:subject:message-id; bh=ep6ig3KsG/haTwVjLCKKm4Kk60+leb3CQTaGMwbdTjg=; b=owEB7QES/pANAwAKAbqXzVK3lkFPAcsmYgBlSj9MqPIIARlpG1B3CB33QBqVpFDk5COfTwoWh HqFk8BAtBKJAbMEAAEKAB0WIQSuRwlXJeYxJc7LJ5C6l81St5ZBTwUCZUo/TAAKCRC6l81St5ZB T8o5C/9te1uxNMdDRUp6GfQqK8yJSbjVLxDs0abTPfEjp57TX/AOdFOmrwiXgdAGkwDUpVY5rKg qp0gHNnyXGtehooFW3SxZUwwtjPSVXxpquEnkv8gCjhenPHbGBAmOakMeL/KnhQXmtTWdZmkUDx iQU5SlQjl1a/Gz8IFzQ1MUTKrwEwlvA6K1ytVD+PbkS+gTi8OuUnZcIYG/2j/B+n3xMKoPjIjq2 tda2fAiMgQpMxzcedyBjpK3EF4br8IF9NRBk+2eRARZ4TZBQbe3+d8x8c12d6nE8l1Dl6+v8XmC bF3irI5j7i0eA+ybQNI9qLEKv+ajjVTiVPDvndJhtvbFzP/002Ok8AvVDXnWNAfiNPPCg561Shh 0Fa85geyCxUZXk6Kn1GwDdUYeMmie6vRU3YJtYdyrXeujBUHq5VE2iTh29hNEoI5869gs2nrZBZ h/Kx8YXwlg4ru1KYYeSbg04EcMK0N8fGC5qDPrdmtWsu3hksyO0KsYOGOz4r0PfP2pK9E= X-Developer-Key: i=j.granados@samsung.com; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for j.granados@samsung.com/default with auth_id=70 X-Original-From: Joel Granados Reply-To: From: Joel Granados This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) Remove empty sentinel element from test_table and test_table_unregister. Signed-off-by: Joel Granados --- lib/test_sysctl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c index 8036aa91a1cb..9d71ec5e8a77 100644 --- a/lib/test_sysctl.c +++ b/lib/test_sysctl.c @@ -130,7 +130,6 @@ static struct ctl_table test_table[] = { .mode = 0644, .proc_handler = proc_do_large_bitmap, }, - { } }; static void test_sysctl_calc_match_int_ok(void) @@ -184,7 +183,6 @@ static struct ctl_table test_table_unregister[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, }, - {} }; static int test_sysctl_run_unregister_nested(void) From patchwork Tue Nov 7 13:44:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados via B4 Relay X-Patchwork-Id: 13448712 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F16D130D01; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dlXsqceI" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9C744C433CC; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699364686; bh=oGAuwTicPekfqewJ5UASm1lSeWTImG5/jlwpiQOtNH4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=dlXsqceIaRjkuA5IeJHu+LQu++YmsXVE3wOhks2vu6pwQW2Yuf8y3fuqcGTDezhrh nLIn/Wct44n580U3lOHF++guKLo57NBlrLcH+CP8dKEVLZ7TvYqaScDG5YrvoJRlcF QgPdHEVU+DDWMpO0z/+MCEtZHfqSGC/yF8neQyIq+b23aVDal8cEH+L4fAKBF9V1t4 cmYfhjd0G/XQ0kFMpKXwcp70TJIBGNrkZ8IQvIBRH32uQuYnIFVy55l62OUBQvZyJX 7fYSb8VX8Bikhd65TQJy/X1zRGf2dQSPireqCR6fcSnCtrafJhV8meTgijuZW9O2fr kaneABMaHl3sg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 876D6C4332F; Tue, 7 Nov 2023 13:44:46 +0000 (UTC) From: Joel Granados via B4 Relay Date: Tue, 07 Nov 2023 14:44:23 +0100 Subject: [PATCH 4/4] coda: Remove the now superfluous sentinel elements from ctl_table array Precedence: bulk X-Mailing-List: fsverity@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231107-jag-sysctl_remove_empty_elem_fs-v1-4-7176632fea9f@samsung.com> References: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> In-Reply-To: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> To: Luis Chamberlain , willy@infradead.org, josh@joshtriplett.org, Kees Cook , David Howells , Alexander Viro , Christian Brauner , Benjamin LaHaise , Eric Biederman , Trond Myklebust , Anna Schumaker , Chuck Lever , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jan Kara , Amir Goldstein , Matthew Bobrowski , Anton Altaparmakov , Namjae Jeon , Mark Fasheh , Joel Becker , Joseph Qi , Iurii Zaikin , Eric Biggers , "Theodore Y. Ts'o" , Chandan Babu R , "Darrick J. Wong" , Jan Harkes , coda@cs.cmu.edu Cc: linux-cachefs@redhat.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ocfs2-devel@lists.linux.dev, fsverity@lists.linux.dev, linux-xfs@vger.kernel.org, codalist@coda.cs.cmu.edu, Joel Granados X-Mailer: b4 0.13-dev-86aa5 X-Developer-Signature: v=1; a=openpgp-sha256; l=826; i=j.granados@samsung.com; h=from:subject:message-id; bh=EW/W6zZslOuVBpUJvlaE+2AnAGMLV/WhhzCxxx+6aVM=; b=owEB7QES/pANAwAKAbqXzVK3lkFPAcsmYgBlSj9MEeSJSagXc2LHP4reG5okoVcP5ennQM0zz fLKCMA3zM2JAbMEAAEKAB0WIQSuRwlXJeYxJc7LJ5C6l81St5ZBTwUCZUo/TAAKCRC6l81St5ZB T+MEC/4ngnTz5jsk7DKSLQFBRxoyRmnmgQuCFEm3xLruOFhQ58fFGc3jLVQ4SRKcyMbZVYLnA/7 92Pua+W916xF0apdkWSutPgZSVFWhE7LqCQB7OANStgZhAKgHWrkjFB8/KPiCDUTdrzG1jdHBd7 qmw+js8kBekSLH5uC319PDTNTNRfVmu6Si2XVh4HdvnLe4xaz5yzzquq8kaZOcJEbVlPnVXBo3E CAy3CAkgj3SWfAzXFyi+Q3xPTvEdBH0vnOqRGR9mIcACCxTVTBlK/TyANrw989cT0ksz8sPCcvE MgG8c3gs8wYgbfHMjfQUURrWfZHWTUBhYBXrmma7XkJ2wabGHM5JWzXasay7RGMldjFLEAGwtTj Su3+/SkuiwYTpDZc5V8iLd1ewA6g1MSpAWHBJs0BBIMYPu2w52V9pE3e8/bK3QVeSs5NqBeZtYp qsORxK78HHwjx16fR/OQVoFLy3Nllnz0WIJoDHWKSbERarg3ey4XX+y7unPjuDW8RiLOk= X-Developer-Key: i=j.granados@samsung.com; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for j.granados@samsung.com/default with auth_id=70 X-Original-From: Joel Granados Reply-To: From: Joel Granados This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) Remove empty sentinel from coda_table Signed-off-by: Joel Granados --- fs/coda/sysctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c index a247c14aaab7..9f2d5743e2c8 100644 --- a/fs/coda/sysctl.c +++ b/fs/coda/sysctl.c @@ -36,7 +36,6 @@ static struct ctl_table coda_table[] = { .mode = 0600, .proc_handler = proc_dointvec }, - {} }; void coda_sysctl_init(void)