[PATCH] ceph: mark lock variable __maybe_unused in ceph_count_file_locks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


The "lock" variable won't be used if CONFIG_FILE_LOCKING=n. We can't
remove it altogether though, since we do need it for the
for_each_file_lock loops. Reduce its scope and mark it __maybe_unused.

Fixes: 3956f35fbd36 ("ceph: adapt to breakup of struct file_lock")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202402062210.3YyBVGF1-lkp@xxxxxxxxx/
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
This warning is fallout from the big file_lock re-org, so this should
probably go in via Christian's tree.
 fs/ceph/locks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c
index ebf4ac0055dd..edfbf94f0d14 100644
--- a/fs/ceph/locks.c
+++ b/fs/ceph/locks.c
@@ -377,7 +377,6 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)
 void ceph_count_locks(struct inode *inode, int *fcntl_count, int *flock_count)
 	struct ceph_client *cl = ceph_inode_to_client(inode);
-	struct file_lock *lock;
 	struct file_lock_context *ctx;
 	*fcntl_count = 0;
@@ -385,6 +384,8 @@ void ceph_count_locks(struct inode *inode, int *fcntl_count, int *flock_count)
 	ctx = locks_inode_context(inode);
 	if (ctx) {
+		struct file_lock __maybe_unused *lock;
 		for_each_file_lock(lock, &ctx->flc_posix)

base-commit: 77f8316a9199a752ffcd136bd01d0566f54e0ea9
change-id: 20240206-flsplit-d4f427d9e0ad

Best regards,
Jeff Layton <jlayton@xxxxxxxxxx>

[Index of Archives]     [CEPH Users]     [Ceph Large]     [Ceph Dev]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux