]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
filelock: move LEASE_BREAK_* flags out of #ifdef CONFIG_FILE_LOCKING
authorJeff Layton <jlayton@kernel.org>
Sat, 16 May 2026 11:11:23 +0000 (07:11 -0400)
committerChristian Brauner <brauner@kernel.org>
Sat, 16 May 2026 15:05:52 +0000 (17:05 +0200)
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 <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202605161232.1lY6pZoM-lkp@intel.com/
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260516-dir-deleg-fix-v1-1-1b68f0aa990a@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
include/linux/filelock.h

index 6e125902c58a5ddb8835ef8705ede417d05c8ae9..7a7a6e8a9a0859d883d99cb3eea66f611d7403ef 100644 (file)
  */
 #define FILE_LOCK_DEFERRED 1
 
+#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;
 
@@ -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);