btrfs: zoned: let the for_treelog test in the allocator stand out

[sfrench/cifs-2.6.git] / fs / btrfs / extent-tree.c

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 9b7cbb669a589c649e006e2955b6966f2240914c..ea651b62d336066d0e020df4ec86cb8e478a41af 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3763,7 +3763,7 @@ static int do_allocation_zoned(struct btrfs_block_group *block_group,
        u64 log_bytenr;
        u64 data_reloc_bytenr;
        int ret = 0;
        u64 log_bytenr;
        u64 data_reloc_bytenr;
        int ret = 0;

-       bool skip;
+       bool skip = false;

 
        ASSERT(btrfs_is_zoned(block_group->fs_info));
 
 
        ASSERT(btrfs_is_zoned(block_group->fs_info));
 


@@ -3773,8 +3773,9 @@ static int do_allocation_zoned(struct btrfs_block_group *block_group,
         */
        spin_lock(&fs_info->treelog_bg_lock);
        log_bytenr = fs_info->treelog_bg;
         */
        spin_lock(&fs_info->treelog_bg_lock);
        log_bytenr = fs_info->treelog_bg;

-       skip = log_bytenr && ((ffe_ctl->for_treelog && bytenr != log_bytenr) ||
-                             (!ffe_ctl->for_treelog && bytenr == log_bytenr));
+       if (log_bytenr && ((ffe_ctl->for_treelog && bytenr != log_bytenr) ||
+                          (!ffe_ctl->for_treelog && bytenr == log_bytenr)))
+               skip = true;

        spin_unlock(&fs_info->treelog_bg_lock);
        if (skip)
                return 1;
        spin_unlock(&fs_info->treelog_bg_lock);
        if (skip)
                return 1;