]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: store and use node size in local variable in check_eb_alignment()
authorFilipe Manana <fdmanana@suse.com>
Tue, 16 Sep 2025 11:13:39 +0000 (12:13 +0100)
committerDavid Sterba <dsterba@suse.com>
Tue, 23 Sep 2025 06:49:23 +0000 (08:49 +0200)
Instead of dereferencing fs_info every time we need to access the node
size, store in a local variable to make the code less verbose and avoid
a line split too.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent_io.c

index ca7174fa024056fbac5217283c9ba4513e74f5e0..681f4f2e44197a04ef8bab1b1574a7049235e676 100644 (file)
@@ -3226,29 +3226,30 @@ static struct extent_buffer *grab_extent_buffer(struct btrfs_fs_info *fs_info,
  */
 static bool check_eb_alignment(struct btrfs_fs_info *fs_info, u64 start)
 {
+       const u32 nodesize = fs_info->nodesize;
+
        if (!IS_ALIGNED(start, fs_info->sectorsize)) {
                btrfs_err(fs_info, "bad tree block start %llu", start);
                return true;
        }
 
-       if (fs_info->nodesize < PAGE_SIZE && !IS_ALIGNED(start, fs_info->nodesize)) {
+       if (nodesize < PAGE_SIZE && !IS_ALIGNED(start, nodesize)) {
                btrfs_err(fs_info,
                "tree block is not nodesize aligned, start %llu nodesize %u",
-                         start, fs_info->nodesize);
+                         start, nodesize);
                return true;
        }
-       if (fs_info->nodesize >= PAGE_SIZE &&
-           !PAGE_ALIGNED(start)) {
+       if (nodesize >= PAGE_SIZE && !PAGE_ALIGNED(start)) {
                btrfs_err(fs_info,
                "tree block is not page aligned, start %llu nodesize %u",
-                         start, fs_info->nodesize);
+                         start, nodesize);
                return true;
        }
-       if (!IS_ALIGNED(start, fs_info->nodesize) &&
+       if (!IS_ALIGNED(start, nodesize) &&
            !test_and_set_bit(BTRFS_FS_UNALIGNED_TREE_BLOCK, &fs_info->flags)) {
                btrfs_warn(fs_info,
 "tree block not nodesize aligned, start %llu nodesize %u, can be resolved by a full metadata balance",
-                             start, fs_info->nodesize);
+                             start, nodesize);
        }
        return false;
 }