From nobody Mon May 25 08:11:41 2026 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 25F38380FD3 for ; Sat, 16 May 2026 11:11:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778929888; cv=none; b=E3GJmMWXYLEtRg+x/V8qag/+ypHeqU2vj8fcdleaeu+bo99j9AZx1teipSG/4nFnvhH6fKltjxJnLNI6/kY/qQm1KyNly9CDcerNLnwSzNVPIj0AxBM19QqSgxYx6oIo6jsdUm3ucP0U1DWwwfZJG5eUQ7p8U3wylHocG/XkomQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778929888; c=relaxed/simple; bh=cytKE3JCYU8Hb/jElA60zlB0bOutsZU+ysYLALuuEA4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=T+NNBh/XYOyjG6HYdTlXrwfk/7vMM38IHYDjmNqj39yZfExlRWx7iTrPb83n0aTyx0O7QDOmanju7Ip9JwwzLaNwOyLkH/PZXcVZzMI1wXHgsLOqqFPjglq6pUvDZQrlAxMS1oTpApKdPhPxluMkLd6uKu3Ekko88Zjp9HrvXPo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HCOGQgx5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HCOGQgx5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F4DFC19425; Sat, 16 May 2026 11:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778929887; bh=cytKE3JCYU8Hb/jElA60zlB0bOutsZU+ysYLALuuEA4=; h=From:Date:Subject:To:Cc:From; b=HCOGQgx5kGFAyZpGkgtc1+j52OwFaeWgzYZ6HZ753Wb+XKo0mA0WXBmSGBciBo4ME u9EBojsoEAOhgzJBmNFJhdxwv+YrguhyVbInP5KRfEXxzfEGM5KQdkZ7ed9M5rIrmp lyIrsb9aSpFtUzb4OFEP9Gv6edVnk+kRKMctJzJ6ifyFSuJ8WMb8zIFph/WVTvnMtG 0T3DlU64h08D+M1tTrGlDQj1nubeIqmW94Wf320F3Vff/aX/4IMulJcFN+Hv1JgyQg 1yAwSe2tUAdi/d94CGrpC10t/sJXyOTHMRYW3HE/7DSyLZNbin3dx8q79OhczUUG4q uOJ0Dy6z/OXVg== From: Jeff Layton Date: Sat, 16 May 2026 07:11:23 -0400 Subject: [PATCH] filelock: move LEASE_BREAK_* flags out of #ifdef CONFIG_FILE_LOCKING Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260516-dir-deleg-fix-v1-1-1b68f0aa990a@kernel.org> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/x2MQQqAIBAAvyJ7bkEXNOgr0aFy1xaiQiGC8O9Jx xmYeaFwVi4wmBcy31r0PBq4zsC6zUdi1NgYyFKw3gWMmjHyzglFH/RCPS3LLCIErbkyN/3/xqn WD/BiS3dfAAAA X-Change-ID: 20260516-dir-deleg-fix-5f272bbafff2 To: Alexander Viro , Christian Brauner , Jan Kara Cc: Chuck Lever , Alexander Aring , linux-kernel@vger.kernel.org, kernel test robot , Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2491; i=jlayton@kernel.org; h=from:subject:message-id; bh=cytKE3JCYU8Hb/jElA60zlB0bOutsZU+ysYLALuuEA4=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqCFDetz1YTH8h3I6C4q8hP9ocJJiJCwwMYMYf+ 93nhe71g+eJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaghQ3gAKCRAADmhBGVaC FRvlEACgEWjD1hR/xFp4LTcyBFYBTaZLSJOFxagNfYRFxjApKM+fjFYW4UM5ucLkH67Gr9eCrSR KFTmK/RP7PMnD8MkUIm+BDhowc47OaQFBOHKY6uhAFepI65QneyBFvQwhZ+Wyqp393aRN4xAwMW 82e8+wcspMI9RB6nqkgqJtq2NoGM0DUcFb7C63u2D9qh/WrDyk5y0E8oKsCJCHOWaDwDFabQBrd 6c0O6q3K3ew79GdKAWlVZq5ZryXAsigW0xEB8NcoxisHGROeSx940lDg1gVeBlYPrtyAdtDSNeS B/TUHu4IEmFz4/4oy6tftWBjgk0blP4Lq53NpB8KIuP0NTgHWywOAnc0HCumhWrm3o0TDY31ZER lxqJdN578J3C4u/rTp7niQc7M3sAgZ3kXf7oTVu4xeCtacgzjKxsUHGHd2Nw/wwwFhSStrQtJmT q6JAyII3aXuZ31/b3Dsydm9+u+ooAkrzkXfRANxmPX1Tw9U3gLp2he995VQ3WqAWH4GgAi66zj+ KTGNZthLxwW8ihvVrjMPnT61b4n7RLVr1AYf3l8ffoj0nTCdwaEypDwlDoOJj32lJrwdbd3dXgZ A5Ua1KYDzwNRaOLefT17RryXdh8X8eMamxtBY53nO3URp/vQfUrR31qjSPH9q6PKdmJy82NPqkO k6OaqcyCNTi3MyQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 This was causing a build break when CONFIG_FILE_LOCKING was disabled. Move the LEASE_BREAK_* flags into the non-#ifdef'ed part of the file. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202605161232.1lY6pZoM-lkp@int= el.com/ Signed-off-by: Jeff Layton --- The kernel test robot caught this one. Christian, feel free to fold this into the patch that introduces the constants. --- include/linux/filelock.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/include/linux/filelock.h b/include/linux/filelock.h index 6e125902c58a..7a7a6e8a9a08 100644 --- a/include/linux/filelock.h +++ b/include/linux/filelock.h @@ -29,6 +29,15 @@ */ #define FILE_LOCK_DEFERRED 1 =20 +#define LEASE_BREAK_LEASE BIT(0) // break leases and delegations +#define LEASE_BREAK_DELEG BIT(1) // break delegations only +#define LEASE_BREAK_LAYOUT BIT(2) // break layouts only +#define LEASE_BREAK_NONBLOCK BIT(3) // non-blocking break +#define LEASE_BREAK_OPEN_RDONLY BIT(4) // readonly open event +#define LEASE_BREAK_DIR_CREATE BIT(5) // dir deleg create event +#define LEASE_BREAK_DIR_DELETE BIT(6) // dir deleg delete event +#define LEASE_BREAK_DIR_RENAME BIT(7) // dir deleg rename event + struct file_lock; struct file_lease; =20 @@ -219,17 +228,6 @@ int locks_lock_inode_wait(struct inode *inode, struct = file_lock *fl); void locks_init_lease(struct file_lease *); void locks_free_lease(struct file_lease *fl); struct file_lease *locks_alloc_lease(void); - -#define LEASE_BREAK_LEASE BIT(0) // break leases and delegations -#define LEASE_BREAK_DELEG BIT(1) // break delegations only -#define LEASE_BREAK_LAYOUT BIT(2) // break layouts only -#define LEASE_BREAK_NONBLOCK BIT(3) // non-blocking break -#define LEASE_BREAK_OPEN_RDONLY BIT(4) // readonly open event -#define LEASE_BREAK_DIR_CREATE BIT(5) // dir deleg create event -#define LEASE_BREAK_DIR_DELETE BIT(6) // dir deleg delete event -#define LEASE_BREAK_DIR_RENAME BIT(7) // dir deleg rename event - - int __break_lease(struct inode *inode, unsigned int flags); void lease_get_mtime(struct inode *, struct timespec64 *time); int generic_setlease(struct file *, int, struct file_lease **, void **priv= ); --- base-commit: ee4cc056e39316155b8dc186845922d5731a3a7a change-id: 20260516-dir-deleg-fix-5f272bbafff2 Best regards, --=20 Jeff Layton