Commit dc60c525 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Remove fs_info argument from btrfs_trans_release_metadata

All current callers of this function just get a reference to the
trans->fs_info member and pass it as the second argument. Collapse this
into the function itself. No functional changes.
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c9b577c0
...@@ -818,9 +818,11 @@ int btrfs_should_end_transaction(struct btrfs_trans_handle *trans) ...@@ -818,9 +818,11 @@ int btrfs_should_end_transaction(struct btrfs_trans_handle *trans)
return should_end_transaction(trans); return should_end_transaction(trans);
} }
static void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans, static void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans)
struct btrfs_fs_info *fs_info)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
if (!trans->block_rsv) { if (!trans->block_rsv) {
ASSERT(!trans->bytes_reserved); ASSERT(!trans->bytes_reserved);
return; return;
...@@ -854,7 +856,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, ...@@ -854,7 +856,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
return 0; return 0;
} }
btrfs_trans_release_metadata(trans, info); btrfs_trans_release_metadata(trans);
trans->block_rsv = NULL; trans->block_rsv = NULL;
if (!list_empty(&trans->new_bgs)) if (!list_empty(&trans->new_bgs))
...@@ -875,7 +877,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, ...@@ -875,7 +877,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
must_run_delayed_refs = 2; must_run_delayed_refs = 2;
} }
btrfs_trans_release_metadata(trans, info); btrfs_trans_release_metadata(trans);
trans->block_rsv = NULL; trans->block_rsv = NULL;
if (!list_empty(&trans->new_bgs)) if (!list_empty(&trans->new_bgs))
...@@ -1969,7 +1971,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) ...@@ -1969,7 +1971,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
return ret; return ret;
} }
btrfs_trans_release_metadata(trans, fs_info); btrfs_trans_release_metadata(trans);
trans->block_rsv = NULL; trans->block_rsv = NULL;
cur_trans = trans->transaction; cur_trans = trans->transaction;
...@@ -2323,7 +2325,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) ...@@ -2323,7 +2325,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
scrub_continue: scrub_continue:
btrfs_scrub_continue(fs_info); btrfs_scrub_continue(fs_info);
cleanup_transaction: cleanup_transaction:
btrfs_trans_release_metadata(trans, fs_info); btrfs_trans_release_metadata(trans);
btrfs_trans_release_chunk_metadata(trans); btrfs_trans_release_chunk_metadata(trans);
trans->block_rsv = NULL; trans->block_rsv = NULL;
btrfs_warn(fs_info, "Skipping commit of aborted transaction."); btrfs_warn(fs_info, "Skipping commit of aborted transaction.");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment