diff options
author | Lu Fengqi <lufq.fnst@cn.fujitsu.com> | 2018-10-11 01:40:35 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-10-15 11:23:41 -0400 |
commit | af9b8a0e2085fc90dca85acd85ee83ece7c05130 (patch) | |
tree | b581f8d45652eb3639d7e8a7396897db2d638b6f | |
parent | 9e920a6f03e40b1eb712f38b29ad5880153754e2 (diff) |
btrfs: remove fs_info from btrfs_check_space_for_delayed_refs
It can be referenced from the transaction handle.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/ctree.h | 3 | ||||
-rw-r--r-- | fs/btrfs/extent-tree.c | 6 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
-rw-r--r-- | fs/btrfs/transaction.c | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 15c659f23411..4002c9fd924b 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -2600,8 +2600,7 @@ static inline u64 btrfs_calc_trunc_metadata_size(struct btrfs_fs_info *fs_info, | |||
2600 | 2600 | ||
2601 | int btrfs_should_throttle_delayed_refs(struct btrfs_trans_handle *trans, | 2601 | int btrfs_should_throttle_delayed_refs(struct btrfs_trans_handle *trans, |
2602 | struct btrfs_fs_info *fs_info); | 2602 | struct btrfs_fs_info *fs_info); |
2603 | int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans, | 2603 | int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans); |
2604 | struct btrfs_fs_info *fs_info); | ||
2605 | void btrfs_dec_block_group_reservations(struct btrfs_fs_info *fs_info, | 2604 | void btrfs_dec_block_group_reservations(struct btrfs_fs_info *fs_info, |
2606 | const u64 start); | 2605 | const u64 start); |
2607 | void btrfs_wait_block_group_reservations(struct btrfs_block_group_cache *bg); | 2606 | void btrfs_wait_block_group_reservations(struct btrfs_block_group_cache *bg); |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3ee5d84cd817..c7de1e720f56 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -2789,9 +2789,9 @@ u64 btrfs_csum_bytes_to_leaves(struct btrfs_fs_info *fs_info, u64 csum_bytes) | |||
2789 | return num_csums; | 2789 | return num_csums; |
2790 | } | 2790 | } |
2791 | 2791 | ||
2792 | int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans, | 2792 | int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans) |
2793 | struct btrfs_fs_info *fs_info) | ||
2794 | { | 2793 | { |
2794 | struct btrfs_fs_info *fs_info = trans->fs_info; | ||
2795 | struct btrfs_block_rsv *global_rsv; | 2795 | struct btrfs_block_rsv *global_rsv; |
2796 | u64 num_heads = trans->transaction->delayed_refs.num_heads_ready; | 2796 | u64 num_heads = trans->transaction->delayed_refs.num_heads_ready; |
2797 | u64 csum_bytes = trans->transaction->delayed_refs.pending_csums; | 2797 | u64 csum_bytes = trans->transaction->delayed_refs.pending_csums; |
@@ -2842,7 +2842,7 @@ int btrfs_should_throttle_delayed_refs(struct btrfs_trans_handle *trans, | |||
2842 | if (val >= NSEC_PER_SEC / 2) | 2842 | if (val >= NSEC_PER_SEC / 2) |
2843 | return 2; | 2843 | return 2; |
2844 | 2844 | ||
2845 | return btrfs_check_space_for_delayed_refs(trans, fs_info); | 2845 | return btrfs_check_space_for_delayed_refs(trans); |
2846 | } | 2846 | } |
2847 | 2847 | ||
2848 | struct async_delayed_refs { | 2848 | struct async_delayed_refs { |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 6c476dc81b8e..6a5557e8909d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -5319,7 +5319,7 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root, | |||
5319 | * Try to steal from the global reserve if there is space for | 5319 | * Try to steal from the global reserve if there is space for |
5320 | * it. | 5320 | * it. |
5321 | */ | 5321 | */ |
5322 | if (!btrfs_check_space_for_delayed_refs(trans, fs_info) && | 5322 | if (!btrfs_check_space_for_delayed_refs(trans) && |
5323 | !btrfs_block_rsv_migrate(global_rsv, rsv, rsv->size, false)) | 5323 | !btrfs_block_rsv_migrate(global_rsv, rsv, rsv->size, false)) |
5324 | return trans; | 5324 | return trans; |
5325 | 5325 | ||
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index e7f618b17b07..c5015458c5c8 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -760,7 +760,7 @@ static int should_end_transaction(struct btrfs_trans_handle *trans) | |||
760 | { | 760 | { |
761 | struct btrfs_fs_info *fs_info = trans->fs_info; | 761 | struct btrfs_fs_info *fs_info = trans->fs_info; |
762 | 762 | ||
763 | if (btrfs_check_space_for_delayed_refs(trans, fs_info)) | 763 | if (btrfs_check_space_for_delayed_refs(trans)) |
764 | return 1; | 764 | return 1; |
765 | 765 | ||
766 | return !!btrfs_block_rsv_check(&fs_info->global_block_rsv, 5); | 766 | return !!btrfs_block_rsv_check(&fs_info->global_block_rsv, 5); |