btrfs: get fs_info from trans in write_one_cache_group
authorDavid Sterba <dsterba@suse.com>
Wed, 20 Mar 2019 10:57:46 +0000 (11:57 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 29 Apr 2019 17:02:40 +0000 (19:02 +0200)
We can read fs_info from the transaction and can drop it from the
parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent-tree.c

index 4fc2fca3b740cdfb918a6574ac445d8792ab80b5..ef901d1685797a20e361022d588f158157645eea 100644 (file)
@@ -3315,10 +3315,10 @@ int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 }
 
 static int write_one_cache_group(struct btrfs_trans_handle *trans,
-                                struct btrfs_fs_info *fs_info,
                                 struct btrfs_path *path,
                                 struct btrfs_block_group_cache *cache)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        int ret;
        struct btrfs_root *extent_root = fs_info->extent_root;
        unsigned long bi;
@@ -3666,8 +3666,7 @@ again:
                        }
                }
                if (!ret) {
-                       ret = write_one_cache_group(trans, fs_info,
-                                                   path, cache);
+                       ret = write_one_cache_group(trans, path, cache);
                        /*
                         * Our block group might still be attached to the list
                         * of new block groups in the transaction handle of some
@@ -3817,8 +3816,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
                        }
                }
                if (!ret) {
-                       ret = write_one_cache_group(trans, fs_info,
-                                                   path, cache);
+                       ret = write_one_cache_group(trans, path, cache);
                        /*
                         * One of the free space endio workers might have
                         * created a new block group while updating a free space
@@ -3835,8 +3833,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
                        if (ret == -ENOENT) {
                                wait_event(cur_trans->writer_wait,
                                   atomic_read(&cur_trans->num_writers) == 1);
-                               ret = write_one_cache_group(trans, fs_info,
-                                                           path, cache);
+                               ret = write_one_cache_group(trans, path, cache);
                        }
                        if (ret)
                                btrfs_abort_transaction(trans, ret);