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

Commit 4c7b9a46 authored by Josef Bacik's avatar Josef Bacik Committed by Greg Kroah-Hartman
Browse files

btrfs: make sure we create all new block groups 



commit 545e3366db823dc3342ca9d7fea803f829c9062f upstream.

Allocating new chunks modifies both the extent and chunk tree, which can
trigger new chunk allocations.  So instead of doing list_for_each_safe,
just do while (!list_empty()) so we make sure we don't exit with other
pending bg's still on our list.

CC: stable@vger.kernel.org # 4.4+
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarLiu Bo <bo.liu@linux.alibaba.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ff40fbf

fs/btrfs/extent-tree.c

+5 −2
Original line number Diff line number Diff line
@@ -10352,7 +10352,7 @@ int btrfs_read_block_groups(struct btrfs_root *root) 
void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans,

				       struct btrfs_root *root)

{

	struct btrfs_block_group_cache *block_group, *tmp;

	struct btrfs_block_group_cache *block_group;

	struct btrfs_root *extent_root = root->fs_info->extent_root;

	struct btrfs_block_group_item item;

	struct btrfs_key key;
@@ -10360,7 +10360,10 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans, 
	bool can_flush_pending_bgs = trans->can_flush_pending_bgs;



	trans->can_flush_pending_bgs = false;

	list_for_each_entry_safe(block_group, tmp, &trans->new_bgs, bg_list) {

	while (!list_empty(&trans->new_bgs)) {

		block_group = list_first_entry(&trans->new_bgs,

					       struct btrfs_block_group_cache,

					       bg_list);

		if (ret)

			goto next;