Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed7a6948 authored by Wang Xiaoguang's avatar Wang Xiaoguang Committed by David Sterba
Browse files

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: default avatarWang Xiaoguang <wangxg.fnst@cn.fujitsu.com>
Reviewed-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cb887083

fs/btrfs/extent-tree.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -8216,6 +8216,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans, 
{

{

	int ret;

	int ret;

	struct btrfs_block_group_cache *block_group;

	struct btrfs_block_group_cache *block_group;

	struct btrfs_space_info *space_info;





	/*

	/*

	 * Mixed block groups will exclude before processing the log so we only

	 * 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, 
	if (!block_group)

	if (!block_group)

		return -EINVAL;

		return -EINVAL;





	ret = btrfs_add_reserved_bytes(block_group, ins->offset,

	space_info = block_group->space_info;

				       ins->offset, 0);

	spin_lock(&space_info->lock);

	BUG_ON(ret); /* logic error */

	spin_lock(&block_group->lock);

	space_info->bytes_reserved += ins->offset;

	block_group->reserved += ins->offset;

	spin_unlock(&block_group->lock);

	spin_unlock(&space_info->lock);



	ret = alloc_reserved_file_extent(trans, root, 0, root_objectid,

	ret = alloc_reserved_file_extent(trans, root, 0, root_objectid,

					 0, owner, offset, ins, 1);

					 0, owner, offset, ins, 1);

	btrfs_put_block_group(block_group);

	btrfs_put_block_group(block_group);