From mboxrd@z Thu Jan 1 00:00:00 1970 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 62C2FC4167D for ; Thu, 9 Nov 2023 16:08:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2BAD8D00A4; Thu, 9 Nov 2023 11:08:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E04748D001A; Thu, 9 Nov 2023 11:08:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C559A8D00EC; Thu, 9 Nov 2023 11:08:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B523F8D001A for ; Thu, 9 Nov 2023 11:08:39 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 37BFAC0520 for ; Thu, 9 Nov 2023 16:08:39 +0000 (UTC) X-FDA: 81438898758.17.E6664C7 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id 60C8340023; Thu, 9 Nov 2023 16:08:36 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="an4/usvb"; spf=pass (imf17.hostedemail.com: domain of ebiggers@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ebiggers@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699546116; a=rsa-sha256; cv=none; b=cX2vQPpjOA1enjhvyjiCiXI2f1cpg5C+WJWHPDbWmUrTofAMZcRhx/yzuqkIvaRcMXMryD ueohrsoDTNsJBH3gFXLb4ru6zq1ZBGERy7OLNobZoui0WZvCfxJLS1oJwHXxfvQymyAG9h v8d+/g5iGCTbadH0ldJGKm5OqyDG3Qc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="an4/usvb"; spf=pass (imf17.hostedemail.com: domain of ebiggers@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ebiggers@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699546116; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OLfHJng+ekbZc0dPIJOrFsWjC3S/PfrenF+HE+3bVGk=; b=DBJsh7UcfA8amT/+XWkRLr01mEBDAR236A4e3gd8PydJXlL27b01yGAPOuz9Wi4SH+UbRO QhsFVcohQR1sI0loWbonlNTte8i8TX0chHPG/fpZNIrNO4JGRwf+DoLQZLgdfbsk4ugD6m 4b3yzD9YuRuV2x0IktFvSp5clK/C+kM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0891A618AC; Thu, 9 Nov 2023 16:08:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B540BC433BB; Thu, 9 Nov 2023 16:08:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699546114; bh=9jv2+syvODBbcmGY4ew2QNcGO1aZvABUK26yZSJvayg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=an4/usvbiRel89q01Pnvd+TES/B31/7WCTra21aJC2vR167RVrBTD0T4l0Np+n4v2 EbNHWbE4mRlTd5664QNTBac6vz4tQNjuUPAC3mzSXSGjwmxfFbC0EtztrMUvvPWYxz sWh1REN/5Ta35snZBzzhuRnh6NPnaQUCGtFqSS6jbo4+qkTAM968xLrAL3uV5ktTpn y3QxjKJ6GsVIlGinqAPCFIpiDBiVj/TNhytdxD8mN4Z0u36nPI2e4kHizhl+ga9hTX YcrNLvLA/u2tD3L89PolcPCLJ71qSrC12ls7rhoKQqiMWBmhKAiZSNIRpl39WLT7qF OYkbTreIzsQaA== Date: Thu, 9 Nov 2023 08:08:31 -0800 From: Eric Biggers To: Joel Granados Cc: 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 , "Theodore Y. Ts'o" , Chandan Babu R , "Darrick J. Wong" , Jan Harkes , coda@cs.cmu.edu, 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@telemann.coda.cs.cmu.edu Subject: Re: [PATCH 2/4] aio: Remove the now superfluous sentinel elements from ctl_table array Message-ID: <20231109160831.GA1933@sol.localdomain> References: <20231107-jag-sysctl_remove_empty_elem_fs-v1-0-7176632fea9f@samsung.com> <20231107-jag-sysctl_remove_empty_elem_fs-v1-2-7176632fea9f@samsung.com> <20231108034231.GB2482@sol.localdomain> <20231109160040.bahkcsp44t5xu7qo@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231109160040.bahkcsp44t5xu7qo@localhost> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 60C8340023 X-Stat-Signature: tbzys1rkjhztc5nhbfgd9ushrjwywqrh X-Rspam-User: X-HE-Tag: 1699546116-704785 X-HE-Meta: U2FsdGVkX190aWDDU6nzlgf09/rfK4wMxpAnLWGGT3B7XyK+0FhctdceosB3f0GdPtH8kI5sqUNV0aqjGtaz8++GLInFNgMzncm8E2sSqniMj70CpFZ1Mx/xppgUg0kmctCPjOvXIWjmNbvsjM66gPuwn9PkJZxcSaaTp2WEW9c/WMFKnucWgr8ORzajV/zQh+82of6gdg1+chdvE9pIW+PAid4fakf0vjhb+BuwmPMlLs2Fcdnl5uqppRr9LAV3i2L1FdpOMy/GQF2Vsm5vzSmMxSk6vkrDvp6LHF0ahJWs2fBZTkl+apoJuXm3IJRjBWXcQKjk+o883EfjRdf9HE7vfdeYBzQVPmQSmuvOH81wsh/8iojSWNLHSRUAYDSBQ4WSUm+ZnrFXRKMJAaHubCoQShXO78wFEsl39F8wmOsPPxKp13Hd2JbjrEYmBJc3boep6ev0Alwd6ZJZ7cIs4FOjhxIp5+s5qwWxAt9bH7WvDwfVwaUIGBUy26i2zMXbPcD0BUeTnW5001fqVSMlcjRW2Kis+SCGAlsTX8DsIfcSyesFi1HLkEFJJ/KIczpGp0j3wg+O7Cfjw+mUkVhDpgAGBmcVhmN6kFhgg05cc0jc56JPDQOCjBoJjuYx53JXbNIftK34g3/cuQQe0AHJWs4QtTHAhUuGM1h1iw9LsZAXZS3tcNXgqzMBp4+K+o8BP30HAMZfCfkMaxSOcYAq0d/rmu+UnpAv/hjMofTaCHWzcaWJqRZpQbN0KBMzn3jjMRYg2TxMejza1Rm1bVy99eKtNalchlXXDtFPQWda2qmh182Yne3bfl1N1NpmQnS5PY/BqqYLrcf8RnFimDqazDLSIbI8Y71eSr/PuezxDgixmF/ZS4X2gU5a9U/ADZSjWPgWyx25SHLs20OfqiGDncDHSU5HYdug3Q1XA8NyogGExLC5RzZRriSLFP6js95lAmBVRJfFisAuBqq4qC6 sC74+yjB s1Tz3xDZNttvSrfjLvF4dMGccZi5qSYBG5vANSRB6x4VD6/wckmpI3gmsLJ1RWjHpcfVSWyff1ReUtO6UsTjcBqOpv6fAQQxqoBQobIAnnkhzwOCk5LAtVGrXFxCeTLdfLS7vWycj0/imsQp/RRoND/1qhMlrK8vHTCQakDlmzEYBOjdCNh88/yb1DaJ+dZP7Y0pBRiu1ZpWcOPMFFyuDwCcKQt1P3UwxoO04UFAT9LA4mcHNv783TiFOFbwwzwOZYIQ8 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: On Thu, Nov 09, 2023 at 05:00:40PM +0100, Joel Granados wrote: > > > 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"); > > > > This does not make sense, and it causes a build error when CONFIG_FS_VERITY=y > > and CONFIG_FS_VERITY_BUILTIN_SIGNATURES=n. > > > > I think all you need to do is delete the sentinel element, the same as > > everywhere else. I just tested it, and it works fine. > I found the reason why I added the CONFIG_FS_VERITY_BUILTIN_SIGNATURES > here: it is related to > https://lore.kernel.org/all/20230705212743.42180-3-ebiggers@kernel.org/ > where the directory is registered with an element only if > CONFIG_FS_VERITY_BUILTIN_SIGNATURES is defined. I had forgotten, but I > even asked for a clarification on the patch :). > > I see that that patch made it to v6.6. So the solution is not to remove > the CONFIG_FS_VERITY_BUILTIN_SIGNATURES, but for me to rebase on top of > a more up to date base. > > @Eric: Please get back to me if the patch in > https://lore.kernel.org/all/20230705212743.42180-3-ebiggers@kernel.org/ > is no longer relevant. > > Best. Yes, that patch was merged in 6.6. I don't think it really matters here though, other than the fact that it moved the code to a different file. I believe all you need to do is remove the sentinel element, the same as anywhere else: diff --git a/fs/verity/init.c b/fs/verity/init.c index a29f062f6047b..b64a76b9ac362 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)