Skip to content

Commit ed7a694

Browse files
wangxiaoguangkdave
authored andcommitted
btrfs: do not decrease bytes_may_use when replaying extents
When replaying extents, there is no need to update bytes_may_use in btrfs_alloc_logged_file_extent(), otherwise it'll trigger a WARN_ON about bytes_may_use. Fixes: ("btrfs: update btrfs_space_info's bytes_may_use timely") Signed-off-by: Wang Xiaoguang <[email protected]> Reviewed-by: Josef Bacik <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent cb88708 commit ed7a694

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

fs/btrfs/extent-tree.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8216,6 +8216,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,
82168216
{
82178217
int ret;
82188218
struct btrfs_block_group_cache *block_group;
8219+
struct btrfs_space_info *space_info;
82198220

82208221
/*
82218222
* Mixed block groups will exclude before processing the log so we only
@@ -8231,9 +8232,14 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,
82318232
if (!block_group)
82328233
return -EINVAL;
82338234

8234-
ret = btrfs_add_reserved_bytes(block_group, ins->offset,
8235-
ins->offset, 0);
8236-
BUG_ON(ret); /* logic error */
8235+
space_info = block_group->space_info;
8236+
spin_lock(&space_info->lock);
8237+
spin_lock(&block_group->lock);
8238+
space_info->bytes_reserved += ins->offset;
8239+
block_group->reserved += ins->offset;
8240+
spin_unlock(&block_group->lock);
8241+
spin_unlock(&space_info->lock);
8242+
82378243
ret = alloc_reserved_file_extent(trans, root, 0, root_objectid,
82388244
0, owner, offset, ins, 1);
82398245
btrfs_put_block_group(block_group);

0 commit comments

Comments
 (0)