[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20251214-vfs-6-19-v1-1-3e9802a2b593@kernel.org>
Date: Sun, 14 Dec 2025 10:34:03 +0900
From: Jeff Layton <jlayton@...nel.org>
To: Christian Brauner <brauner@...nel.org>, NeilBrown <neil@...wn.name>,
Jan Kara <jack@...e.cz>
Cc: Chris Mason <clm@...a.com>, linux-kernel@...r.kernel.org,
Jeff Layton <jlayton@...nel.org>
Subject: [PATCH] vfs: fix break_lease() function signature in
!CONFIG_FILE_LOCKING case
Commit 4be9f3cc582a ("filelock: rework the __break_lease API to use
flags") contained a spurious change to the break_lease() stub when
CONFIG_FILE_LOCKING is N. Revert that part of the patch.
Fixes: 4be9f3cc582a ("filelock: rework the __break_lease API to use flags")
Signed-off-by: Jeff Layton <jlayton@...nel.org>
---
This is a problem that Chris found with his Claude review prompts. It
doesn't seem to cause a problem with the build when file locking is
disabled, so I consider this low-priority. Your call if you want
to take it in for v6.19 or v7.0.
---
include/linux/filelock.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/filelock.h b/include/linux/filelock.h
index 54b824c05299261e6bd6acc4175cb277ea35b35d..078da14dc4ce52d34cb3bbeb44a6274daa0f6056 100644
--- a/include/linux/filelock.h
+++ b/include/linux/filelock.h
@@ -552,7 +552,7 @@ static inline bool is_delegated(struct delegated_inode *di)
return false;
}
-static inline int break_lease(struct inode *inode, bool wait)
+static inline int break_lease(struct inode *inode, unsigned int mode)
{
return 0;
}
---
base-commit: 187d0801404f415f22c0b31531982c7ea97fa341
change-id: 20251214-vfs-6-19-09d4562fbab0
Best regards,
--
Jeff Layton <jlayton@...nel.org>
Powered by blists - more mailing lists