Commit 9270501c authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: change root to fs_info for btrfs_reserve_metadata_bytes 



We used to need the root for btrfs_reserve_metadata_bytes to check the
orphan cleanup state, but we no longer need that, we simply need the
fs_info.  Change btrfs_reserve_metadata_bytes() to use the fs_info, and
change both btrfs_block_rsv_refill() and btrfs_block_rsv_add() to do the
same as they simply call btrfs_reserve_metadata_bytes() and then
manipulate the block_rsv that is being used.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.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>
parent 54230013

fs/btrfs/block-group.c

+1 −1
Original line number Diff line number Diff line
@@ -3790,7 +3790,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans, 
	}



	if (!ret) {

		ret = btrfs_block_rsv_add(fs_info->chunk_root,

		ret = btrfs_block_rsv_add(fs_info,

					  &fs_info->chunk_block_rsv,

					  bytes, BTRFS_RESERVE_NO_FLUSH);

		if (!ret)

fs/btrfs/block-rsv.c

+5 −5
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info, 
	kfree(rsv);

}



int btrfs_block_rsv_add(struct btrfs_root *root,

int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,

			struct btrfs_block_rsv *block_rsv, u64 num_bytes,

			enum btrfs_reserve_flush_enum flush)

{
@@ -217,7 +217,7 @@ int btrfs_block_rsv_add(struct btrfs_root *root, 
	if (num_bytes == 0)

		return 0;



	ret = btrfs_reserve_metadata_bytes(root, block_rsv, num_bytes, flush);

	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv, num_bytes, flush);

	if (!ret)

		btrfs_block_rsv_add_bytes(block_rsv, num_bytes, true);
@@ -241,7 +241,7 @@ int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_factor) 
	return ret;

}



int btrfs_block_rsv_refill(struct btrfs_root *root,

int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,

			   struct btrfs_block_rsv *block_rsv, u64 min_reserved,

			   enum btrfs_reserve_flush_enum flush)

{
@@ -262,7 +262,7 @@ int btrfs_block_rsv_refill(struct btrfs_root *root, 
	if (!ret)

		return 0;



	ret = btrfs_reserve_metadata_bytes(root, block_rsv, num_bytes, flush);

	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv, num_bytes, flush);

	if (!ret) {

		btrfs_block_rsv_add_bytes(block_rsv, num_bytes, false);

		return 0;
@@ -523,7 +523,7 @@ struct btrfs_block_rsv *btrfs_use_block_rsv(struct btrfs_trans_handle *trans, 
				block_rsv->type, ret);

	}

try_reserve:

	ret = btrfs_reserve_metadata_bytes(root, block_rsv, blocksize,

	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv, blocksize,

					   BTRFS_RESERVE_NO_FLUSH);

	if (!ret)

		return block_rsv;

fs/btrfs/block-rsv.h

+2 −2
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@ void btrfs_init_metadata_block_rsv(struct btrfs_fs_info *fs_info, 
				   unsigned short type);

void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,

			  struct btrfs_block_rsv *rsv);

int btrfs_block_rsv_add(struct btrfs_root *root,

int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,

			struct btrfs_block_rsv *block_rsv, u64 num_bytes,

			enum btrfs_reserve_flush_enum flush);

int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_factor);

int btrfs_block_rsv_refill(struct btrfs_root *root,

int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,

			   struct btrfs_block_rsv *block_rsv, u64 min_reserved,

			   enum btrfs_reserve_flush_enum flush);

int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,

fs/btrfs/delalloc-space.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes) 
	ret = btrfs_qgroup_reserve_meta_prealloc(root, qgroup_reserve, true);

	if (ret)

		return ret;

	ret = btrfs_reserve_metadata_bytes(root, block_rsv, meta_reserve, flush);

	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv, meta_reserve, flush);

	if (ret) {

		btrfs_qgroup_free_meta_prealloc(root, qgroup_reserve);

		return ret;

fs/btrfs/delayed-inode.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ static int btrfs_delayed_inode_reserve_metadata( 
					  BTRFS_QGROUP_RSV_META_PREALLOC, true);

		if (ret < 0)

			return ret;

		ret = btrfs_block_rsv_add(root, dst_rsv, num_bytes,

		ret = btrfs_block_rsv_add(fs_info, dst_rsv, num_bytes,

					  BTRFS_RESERVE_NO_FLUSH);

		/* NO_FLUSH could only fail with -ENOSPC */

		ASSERT(ret == 0 || ret == -ENOSPC);