aboutsummaryrefslogtreecommitdiff
path: root/fs/btrfs/free-space-cache.c
diff options
context:
space:
mode:
authorGravatar Naohiro Aota <naohiro.aota@wdc.com> 2021-08-09 13:13:44 +0900
committerGravatar David Sterba <dsterba@suse.com> 2021-08-23 13:19:11 +0200
commit0ae79c6fe70d5c5c645733b7ed39d5e6021d8c9a (patch)
treef7b1cb30644f0a9d212c67ef49d0b9a557dd4089 /fs/btrfs/free-space-cache.c
parentbtrfs: zoned: suppress reclaim error message on EAGAIN (diff)
downloadlinux-0ae79c6fe70d5c5c645733b7ed39d5e6021d8c9a.tar.gz
linux-0ae79c6fe70d5c5c645733b7ed39d5e6021d8c9a.tar.bz2
linux-0ae79c6fe70d5c5c645733b7ed39d5e6021d8c9a.zip
btrfs: zoned: fix block group alloc_offset calculation
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: 011b41bffa3d ("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>
Diffstat (limited to 'fs/btrfs/free-space-cache.c')
-rw-r--r--fs/btrfs/free-space-cache.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index e91440bd0794..da0eee7c9e5f 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -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;
}