]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: zoned: fix block group alloc_offset calculation
authorNaohiro Aota <naohiro.aota@wdc.com>
Mon, 9 Aug 2021 04:13:44 +0000 (13:13 +0900)
committerDavid Sterba <dsterba@suse.com>
Mon, 23 Aug 2021 11:19:11 +0000 (13:19 +0200)
alloc_offset is offset from the start of a block group and @offset is
actually an address in logical space. Thus, we need to consider
block_group->start when calculating them.

Fixes: e46eb1682614 ("btrfs: zoned: advance allocation pointer after tree log node")
CC: stable@vger.kernel.org # 5.12+
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/free-space-cache.c

index e91440bd0794e18c6d84b0a085d8c35cefb534f8..da0eee7c9e5f38ba00dc7d3290302a6d83bf051d 100644 (file)
@@ -2647,8 +2647,11 @@ int btrfs_remove_free_space(struct btrfs_block_group *block_group,
                 * btrfs_pin_extent_for_log_replay() when replaying the log.
                 * Advance the pointer not to overwrite the tree-log nodes.
                 */
-               if (block_group->alloc_offset < offset + bytes)
-                       block_group->alloc_offset = offset + bytes;
+               if (block_group->start + block_group->alloc_offset <
+                   offset + bytes) {
+                       block_group->alloc_offset =
+                               offset + bytes - block_group->start;
+               }
                return 0;
        }