btrfs: get fs_info from trans in write_one_cache_group (39db232d) · Commits · 戴 / test

fs/btrfs/extent-tree.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -3315,10 +3315,10 @@ int btrfs_dec_ref(struct btrfs_trans_handle trans, struct btrfs_root root,
		}

		static int write_one_cache_group(struct btrfs_trans_handle *trans,
		struct btrfs_fs_info *fs_info,
		struct btrfs_path *path,
		struct btrfs_block_group_cache *cache)
		{
		struct btrfs_fs_info *fs_info = trans->fs_info;
		int ret;
		struct btrfs_root *extent_root = fs_info->extent_root;
		unsigned long bi;
		@@ -3666,8 +3666,7 @@ again:
		}
		}
		if (!ret) {
		ret = write_one_cache_group(trans, fs_info,
		path, cache);
		ret = write_one_cache_group(trans, path, cache);
		/*
		* Our block group might still be attached to the list
		* of new block groups in the transaction handle of some
		@@ -3817,8 +3816,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
		}
		}
		if (!ret) {
		ret = write_one_cache_group(trans, fs_info,
		path, cache);
		ret = write_one_cache_group(trans, path, cache);
		/*
		* One of the free space endio workers might have
		* created a new block group while updating a free space
		@@ -3835,8 +3833,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
		if (ret == -ENOENT) {
		wait_event(cur_trans->writer_wait,
		atomic_read(&cur_trans->num_writers) == 1);
		ret = write_one_cache_group(trans, fs_info,
		path, cache);
		ret = write_one_cache_group(trans, path, cache);
		}
		if (ret)
		btrfs_abort_transaction(trans, ret);