linux-kernel - [PATCH] ceph: mark lock variable __maybe_unused in ceph_count_file

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240206-flsplit-v1-1-17497d0c1e14@kernel.org>
Date: Tue, 06 Feb 2024 09:52:49 -0500
From: Jeff Layton <jlayton@...nel.org>
To: Christian Brauner <brauner@...nel.org>, Xiubo Li <xiubli@...hat.com>, 
 Ilya Dryomov <idryomov@...il.com>
Cc: ceph-devel@...r.kernel.org, linux-fsdevel@...r.kernel.org, 
 linux-kernel@...r.kernel.org, kernel test robot <lkp@...el.com>, 
 Jeff Layton <jlayton@...nel.org>
Subject: [PATCH] ceph: mark lock variable __maybe_unused in
 ceph_count_file_locks

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@...el.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202402062210.3YyBVGF1-lkp@intel.com/
Signed-off-by: Jeff Layton <jlayton@...nel.org>
---
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;
+
 		spin_lock(&ctx->flc_lock);
 		for_each_file_lock(lock, &ctx->flc_posix)
 			++(*fcntl_count);

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

Best regards,
-- 
Jeff Layton <jlayton@...nel.org>