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

Commit af9b8a0e authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: remove fs_info from btrfs_check_space_for_delayed_refs 



It can be referenced from the transaction handle.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9e920a6f

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -2600,8 +2600,7 @@ static inline u64 btrfs_calc_trunc_metadata_size(struct btrfs_fs_info *fs_info, 


int btrfs_should_throttle_delayed_refs(struct btrfs_trans_handle *trans,

				       struct btrfs_fs_info *fs_info);

int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans,

				       struct btrfs_fs_info *fs_info);

int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans);

void btrfs_dec_block_group_reservations(struct btrfs_fs_info *fs_info,

					 const u64 start);

void btrfs_wait_block_group_reservations(struct btrfs_block_group_cache *bg);

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -2789,9 +2789,9 @@ u64 btrfs_csum_bytes_to_leaves(struct btrfs_fs_info *fs_info, u64 csum_bytes) 
	return num_csums;

}



int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans,

				       struct btrfs_fs_info *fs_info)

int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_block_rsv *global_rsv;

	u64 num_heads = trans->transaction->delayed_refs.num_heads_ready;

	u64 csum_bytes = trans->transaction->delayed_refs.pending_csums;
@@ -2842,7 +2842,7 @@ int btrfs_should_throttle_delayed_refs(struct btrfs_trans_handle *trans, 
	if (val >= NSEC_PER_SEC / 2)

		return 2;



	return btrfs_check_space_for_delayed_refs(trans, fs_info);

	return btrfs_check_space_for_delayed_refs(trans);

}



struct async_delayed_refs {

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -5319,7 +5319,7 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root, 
		 * Try to steal from the global reserve if there is space for

		 * it.

		 */

		if (!btrfs_check_space_for_delayed_refs(trans, fs_info) &&

		if (!btrfs_check_space_for_delayed_refs(trans) &&

		    !btrfs_block_rsv_migrate(global_rsv, rsv, rsv->size, false))

			return trans;

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int should_end_transaction(struct btrfs_trans_handle *trans) 
{

	struct btrfs_fs_info *fs_info = trans->fs_info;



	if (btrfs_check_space_for_delayed_refs(trans, fs_info))

	if (btrfs_check_space_for_delayed_refs(trans))

		return 1;



	return !!btrfs_block_rsv_check(&fs_info->global_block_rsv, 5);