Commit 97cb39bb authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Remove root argument of cleanup_transaction

The only thing the passed root is used for is:
1. get a reference to the fs_info and to
2. call trace_btrfs_transaction_commit.

We can achieve 1) by simply referring to the fs_info from passed trans
object. As far as 2) is concerned cleanup_transaction is called from
only one place and the 'root' argument passed is the one from the trans
handle. No functional changes.
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9386d8bc
...@@ -1867,10 +1867,9 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans, ...@@ -1867,10 +1867,9 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans,
} }
static void cleanup_transaction(struct btrfs_trans_handle *trans, static void cleanup_transaction(struct btrfs_trans_handle *trans, int err)
struct btrfs_root *root, int err)
{ {
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_transaction *cur_trans = trans->transaction; struct btrfs_transaction *cur_trans = trans->transaction;
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
...@@ -1910,7 +1909,7 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans, ...@@ -1910,7 +1909,7 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans,
btrfs_put_transaction(cur_trans); btrfs_put_transaction(cur_trans);
btrfs_put_transaction(cur_trans); btrfs_put_transaction(cur_trans);
trace_btrfs_transaction_commit(root); trace_btrfs_transaction_commit(trans->root);
if (current->journal_info == trans) if (current->journal_info == trans)
current->journal_info = NULL; current->journal_info = NULL;
...@@ -2331,7 +2330,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) ...@@ -2331,7 +2330,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
btrfs_warn(fs_info, "Skipping commit of aborted transaction."); btrfs_warn(fs_info, "Skipping commit of aborted transaction.");
if (current->journal_info == trans) if (current->journal_info == trans)
current->journal_info = NULL; current->journal_info = NULL;
cleanup_transaction(trans, trans->root, ret); cleanup_transaction(trans, ret);
return ret; return ret;
} }
......
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