From patchwork Tue Nov 21 11:35:12 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: 13462862 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA8CEC54FB9 for ; Tue, 21 Nov 2023 11:35:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D3A296B0454; Tue, 21 Nov 2023 06:35:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C717F6B0444; Tue, 21 Nov 2023 06:35:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82B016B03F3; Tue, 21 Nov 2023 06:35:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 449FA6B041D for ; Tue, 21 Nov 2023 06:35:40 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0E8DD16095E for ; Tue, 21 Nov 2023 11:35:40 +0000 (UTC) X-FDA: 81481756440.26.61A9A81 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 175D0140017; Tue, 21 Nov 2023 11:35:36 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=FazX2+kM; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of devnull+j.granados.samsung.com@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=devnull+j.granados.samsung.com@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700566537; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cMVMzroLoaT9yDgOx08L1aOhUMV7pg3nb9Mo98ThUvc=; b=4aERsjQ4fkhsVwBVoOaDP0NpScSKCEPzVDYWMM5OGg0L+BuOa8LemHvUZ186eGNiV9ZJkO ovPeWr6cuAXPdhzFZbekno34Hjc7/LzxyTP2UjvjpLJqDXUEH8KChbehUth/9STqf5c3NT ljjy0ikM3tdjzeBkN9WWxU6XKPpSNh4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=FazX2+kM; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of devnull+j.granados.samsung.com@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=devnull+j.granados.samsung.com@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700566537; a=rsa-sha256; cv=none; b=KAoGYYctVtn+CH/5zfQAtdXWGIn7dzbZP1yabwDt4RugOz51mnDPqiw0jmHFPWutA3Iawi MsLpmOy0nKVMhrnvdJQNwFLhN0+aaNOuSjWVzINbadQsrBpV6hQQbfPHcNFp1Lvkp6elZK ypenCC6bi97mgC8cJGkQlx2tuGaQS/g= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 12C956186D; Tue, 21 Nov 2023 11:35:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 87F62C433CA; Tue, 21 Nov 2023 11:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700566534; bh=4FYrGCUxLsW9acF7WTWE7D+UXyy8GglZc5VqyKXmbbk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=FazX2+kMmuW7nxT8kXeCmgoaeyZ7d3BEx7ITc/Y4WApftLrKmK3T+32Y+EM23mfIt ibzTVrk+I36YMpk/K7HI7ySSVao3jmJFblqOs8RTijrcEqRPNZc5d5d3834wAKLKhA hm+rx9oGxM0wg08yzjnF6+hwaY3mwApYWX20w4Z+NnMTJbggBh2CReeNf6K0P+5g+T /coEhjtVoaRQqMNLna9FLKWESuMq9INJuWYtk7GHlncRRCQ0Ck2NusByohgdjythhH gZgUOhm5Tb/IVNN4pnT7vIESEUBKU1uUlwMQwKlIbm2ThT2C8JC5JWiDVwaV7Qc0w0 B7oT1GpKv1UiA== 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 62BA5C61D94; Tue, 21 Nov 2023 11:35:34 +0000 (UTC) From: Joel Granados via B4 Relay Date: Tue, 21 Nov 2023 12:35:12 +0100 Subject: [PATCH v2 2/4] fs: Remove the now superfluous sentinel elements from ctl_table array MIME-Version: 1.0 Message-Id: <20231121-jag-sysctl_remove_empty_elem_fs-v2-2-39eab723a034@samsung.com> References: <20231121-jag-sysctl_remove_empty_elem_fs-v2-0-39eab723a034@samsung.com> In-Reply-To: <20231121-jag-sysctl_remove_empty_elem_fs-v2-0-39eab723a034@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=10413; i=j.granados@samsung.com; h=from:subject:message-id; bh=llL+K5Z8INjFWqo4ffoJOWg51ixZ8Jcu+zyGzk7PO4w=; b=owEB7QES/pANAwAKAbqXzVK3lkFPAcsmYgBlXJYEvbkv1iEb5c/RlrZwHWgAnqI8ZbphDxM7H hN8N7+Cv5uJAbMEAAEKAB0WIQSuRwlXJeYxJc7LJ5C6l81St5ZBTwUCZVyWBAAKCRC6l81St5ZB T9TEC/4z/NS3bAFvGSTidZE4253Q5vHMktqCRlk9CHaE01mniUmfas9pRxtBZPehKeCel1BKyTf r4OZaCTNDPvy2wv4AxceBa8VccMsLsjgA2pDdmxnkeHOvAMiqC611NWlX6yvs2KBYjywrOeNiv0 qM+Vlc4jYh8zXkzW/qwrb4+4+VobPcrNBCXpCuHY/81Lm5+4hj8m98u4HuCa8hPouT/avnJIEmV vmzuRJcbhNSR8dEzAS4cLQmYiXQRZwd6RwVdtmJxqNADaJHlT4cchMgz9x4DJsSXb5zvKYyCAbf LC4CCYD1fhk+FJSSO7y5Ck1RqiP6AMyX+biKnzt7vxP4ACQJvn+NC//0N0M12XDrQrY/EDwi19V GzWgMLX5lddsZhOM8Oo3T1UvGj3k5l6JGOaXlyb5zKRkgnBtz3o7sj2RF/OxhJlIX9/0gyDLt7b 8yJuP7WtWkIUGtNal2ucQOCdNLa3XVDH2XBpeEPtzAtNyO6G1svfCDUksXd87TpHyF0TQ= 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: X-Rspamd-Queue-Id: 175D0140017 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 5o6q9k5wrbi87yxrw1kxgiws4xnwgog6 X-HE-Tag: 1700566536-512538 X-HE-Meta: U2FsdGVkX19nGSvWgpP5QR7q8Of+PzCrEWWumorka8+Rm7dmIAKMD9Q+54k0pfquSJ0M/xyIAE5pCrUNB5ONE1YHei+uG7Yci3H9uQQVxOIeRy31N22c1Kceh5/sOEpBdh0w6cCAzQC2qGwT0BSflbPXwl16GwMJk5UkDe7XSLTGbtpUuzQr+fVxj35jR29bACRlBs47cNp4qr5QwsUj/RgMGxHu9P8OAUFben+5Gb0VPHBc4fV/jbZEerXfB3Lt3BTbKB7TNQIssP7/awr8wRSj/fsKPdx50Ss2Esp6awNOPJ8kHwxSMj2E+rfrfgZQEGyB6xWBuBELEIMT/zeKUTdy6o7/GkTU+al1J11AWsuEW+wU+NJ7m8sUSsY0tlA0jlbptp/McxxLZ5tiJxcGA1pC3w9ZMDs5gCvADqkouW6e3GJZX484JkMzvEF4+h7fmdfAWRI9FEuWa32hz5r49vaRrmHt/nXKI7qTR60dLIKtRAGfizWbXdvHlUbop//jDCRz3dpmWNKFthGvvKDQlq69w6rQYF7JZmA9/vvEMnX5RT1VCaiEoVvBxvpA68xt6UvglypFCfShKSEn7oZ3JJD2eEnnLxTh0VPCrSsTMw6NYJcr66fIWB42hBBpiguyjTU+hlmGIQeDUCnx3ynFlZU4BNPjC3WrYd3pYB4rK9eYj2ALl2LHZx/MNUNXVBXM0G8ORD3uwFuJqnSGmqrEE6fmuMx6puxcpUCREgafFCK6ZOA385rLW/Z0i4nDuYvp52ynZ7KuMFE4Aw0opSaVDhWaP2urHt9gV3Wjv+w9AShTy1qOE6t1HIxYWjBwvc4hZHaexvRyHcBmOHTLo3uJ6rU5wA/KCZ3/0PaHIJ4zHecqnV98dDIwzoApI8uWPRhKfzBKCoJyESYPpf4iEaecohTi6d5UtXBQllnO5N+uGaoV8F3Ayto8sIXZCwPSSOqGGZICCxcwyutN7X9rWGJ MEzn2YbD nlgWXpvVH/Nr9xxe/tJBDwYetzwvsb7WOawN7+yj2tsVECurHSchJnVzipVILU4sass//ua7NaQhSt3THNgEQgWKFAeW19AkfpSf7MNPLatdBTc0t3+t3ztskMVlKdzT4LuM2PS5LPP+0PqhIzcFMQ2FvK4eg7JLtxMje2gSirLM/8P+0g5vfObaoK858NShkzwgvEpqaxs6cUqkffDNWodfw1EPpWZQw+wts+nipFTx9qC+FutP6V9njPg0XC21b5SLgDWS6ykY7Vu/+2KZAUDaMQsmtojwMeLTit9Ys8R+QSBr23D4xkQWBmjNaUsqbREpZWwEV8k6WsmjiA5U1Vj8V9lr+K21hSPOvjrdWrf8SiOIGdibQtW918XZ7Yzsml/corGIGUnnaPE7DzuarJEHrOvmUUeUV2QMtG1saMShDap+ldEDFfRLByX7u7coJQP1dUQtrDzkp32cBCwBF2mIcAg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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: Jan Kara Reviewed-by: Darrick J. Wong --- 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/init.c | 1 - fs/xfs/xfs_sysctl.c | 2 -- 26 files changed, 27 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/init.c b/fs/verity/init.c index a29f062f6047..b64a76b9ac36 100644 --- a/fs/verity/init.c +++ b/fs/verity/init.c @@ -24,7 +24,6 @@ static struct ctl_table fsverity_sysctl_table[] = { .extra2 = SYSCTL_ONE, }, #endif - { } }; static void __init fsverity_init_sysctl(void) 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