From: Arnd Bergmann <arnd@kernel.org>
To: NeilBrown <neilb@suse.de>, Christian Brauner <brauner@kernel.org>,
Jeff Layton <jlayton@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Luca Vizzarro <Luca.Vizzarro@arm.com>,
Tom Talpey <tom@talpey.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] filelock: ignore 'lock' argument to for_each_file_lock()
Date: Mon, 12 Feb 2024 12:26:11 +0100 [thread overview]
Message-ID: <20240212112620.1272058-1-arnd@kernel.org> (raw)
From: Arnd Bergmann <arnd@arndb.de>
When CONFIG_FILE_LOCKING is disabled, ceph causes a warning about
a variable that is only used insode of the for_each_file_lock()
loop:
fs/ceph/locks.c: In function 'ceph_count_locks':
fs/ceph/locks.c:380:27: error: unused variable 'lock' [-Werror=unused-variable]
380 | struct file_lock *lock;
Rather than working around this in ceph, change the macro definition
to still contain a reference to the variable in order to shut up the
warning.
Fixes: 75cabec0111b ("filelock: add some new helper functions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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 aabd4bdf7eba..69290173280a 100644
--- a/include/linux/filelock.h
+++ b/include/linux/filelock.h
@@ -283,7 +283,7 @@ static inline void locks_wake_up(struct file_lock *fl)
{
}
-#define for_each_file_lock(_fl, _head) while(false)
+#define for_each_file_lock(_fl, _head) while((void)_fl, false)
static inline void
locks_free_lock_context(struct inode *inode)
--
2.39.2
next reply other threads:[~2024-02-12 11:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-12 11:26 Arnd Bergmann [this message]
2024-02-12 12:07 ` Christian Brauner
2024-02-12 12:08 ` Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240212112620.1272058-1-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=Luca.Vizzarro@arm.com \
--cc=arnd@arndb.de \
--cc=brauner@kernel.org \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.de \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®