From: Nathan Chancellor <nathan@kernel.org>
To: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>
Cc: Ioannis Angelakopoulos <iangelak@fb.com>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH] btrfs: Fix unused variable in load_free_space_cache()
Date: Fri, 22 Jul 2022 09:38:54 -0700 [thread overview]
Message-ID: <20220722163854.1189931-1-nathan@kernel.org> (raw)
When CONFIG_LOCKDEP is unset, there is a warning about the mapping
variable being unused:
fs/btrfs/free-space-cache.c:929:24: warning: variable 'mapping' set but not used [-Wunused-but-set-variable]
struct address_space *mapping;
^
1 warning generated.
lockdep_set_class() does not do anything with the first parameter to the
macro when CONFIG_LOCKDEP is not set so just eliminate the mapping
variable and use inode instead, which is always used in the function.
Fixes: 22d85ab1af7d ("btrfs: Change the lockdep class of struct inode's invalidate_lock")
Link: https://github.com/ClangBuiltLinux/linux/issues/1672
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
fs/btrfs/free-space-cache.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index a2b2329ae558..e8fce6b19559 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -926,7 +926,6 @@ int load_free_space_cache(struct btrfs_block_group *block_group)
int ret = 0;
bool matched;
u64 used = block_group->used;
- struct address_space *mapping;
/*
* Because we could potentially discard our loaded free space, we want
@@ -991,8 +990,8 @@ int load_free_space_cache(struct btrfs_block_group *block_group)
* space inodes to prevent false positives related to locks for normal
* inodes.
*/
- mapping = &inode->i_data;
- lockdep_set_class(&mapping->invalidate_lock, &btrfs_free_space_inode_key);
+ lockdep_set_class(&inode->i_data.invalidate_lock,
+ &btrfs_free_space_inode_key);
ret = __load_free_space_cache(fs_info->tree_root, inode, &tmp_ctl,
path, block_group->start);
base-commit: ba37a9d53d71f94ed78f2e53d84be7fa77e2a2b3
--
2.37.1
next reply other threads:[~2022-07-22 16:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-22 16:38 Nathan Chancellor [this message]
2022-07-25 16:02 ` David Sterba
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=20220722163854.1189931-1-nathan@kernel.org \
--to=nathan@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=iangelak@fb.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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®