btrfs: Remove fs_info argument of btrfs_write_and_wait_transaction
authorNikolay Borisov <nborisov@suse.com>
Wed, 7 Feb 2018 15:55:50 +0000 (17:55 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 26 Mar 2018 13:09:33 +0000 (15:09 +0200)
We already pass btrfs_trans_handle which contains a reference to the
fs_info so use that. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/transaction.c

index f6a33f474e7bb49fe2744e32b636b5cf6125a5a6..ca2d91163af9755c51a49b88959250935b786946 100644 (file)
@@ -1091,12 +1091,12 @@ int btrfs_wait_tree_log_extents(struct btrfs_root *log_root, int mark)
  *
  * @trans: transaction whose dirty pages we'd like to write
  */
  *
  * @trans: transaction whose dirty pages we'd like to write
  */
-static int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans,
-                                           struct btrfs_fs_info *fs_info)
+static int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans)
 {
        int ret;
        int ret2;
        struct extent_io_tree *dirty_pages = &trans->transaction->dirty_pages;
 {
        int ret;
        int ret2;
        struct extent_io_tree *dirty_pages = &trans->transaction->dirty_pages;
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct blk_plug plug;
 
        blk_start_plug(&plug);
        struct blk_plug plug;
 
        blk_start_plug(&plug);
@@ -1407,7 +1407,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
        if (ret)
                goto out;
        switch_commit_roots(trans->transaction);
        if (ret)
                goto out;
        switch_commit_roots(trans->transaction);
-       ret = btrfs_write_and_wait_transaction(trans, fs_info);
+       ret = btrfs_write_and_wait_transaction(trans);
        if (ret)
                btrfs_handle_fs_error(fs_info, ret,
                        "Error while writing out transaction for qgroup");
        if (ret)
                btrfs_handle_fs_error(fs_info, ret,
                        "Error while writing out transaction for qgroup");
@@ -2261,7 +2261,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
 
        wake_up(&fs_info->transaction_wait);
 
 
        wake_up(&fs_info->transaction_wait);
 
-       ret = btrfs_write_and_wait_transaction(trans, fs_info);
+       ret = btrfs_write_and_wait_transaction(trans);
        if (ret) {
                btrfs_handle_fs_error(fs_info, ret,
                                      "Error while writing out transaction");
        if (ret) {
                btrfs_handle_fs_error(fs_info, ret,
                                      "Error while writing out transaction");