btrfs: get fs_info from trans in btrfs_run_dev_stats
authorDavid Sterba <dsterba@suse.com>
Wed, 20 Mar 2019 15:50:38 +0000 (16:50 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 29 Apr 2019 17:02:43 +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/transaction.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h

index cc326d964567b802bd3a7bd7dbbdaf026e63c11a..1e3d8d9b0ed54eb1bbd418208545f1987a4caed8 100644 (file)
@@ -1094,7 +1094,7 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans)
        if (ret)
                return ret;
 
-       ret = btrfs_run_dev_stats(trans, fs_info);
+       ret = btrfs_run_dev_stats(trans);
        if (ret)
                return ret;
        ret = btrfs_run_dev_replace(trans, fs_info);
index c728f0f604a8e1137ee01359c1fb2ee8a657775a..5ee24876fac3a36c7441b1b98224be99dd423c2e 100644 (file)
@@ -7404,9 +7404,9 @@ out:
 /*
  * called from commit_transaction. Writes all changed device stats to disk.
  */
-int btrfs_run_dev_stats(struct btrfs_trans_handle *trans,
-                       struct btrfs_fs_info *fs_info)
+int btrfs_run_dev_stats(struct btrfs_trans_handle *trans)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        struct btrfs_device *device;
        int stats_cnt;
index 986eaeba1a077cbc8ddbad81245dbcb2f3020967..b3a89d767512819f4ab4998f39edcd1ff10cd059 100644 (file)
@@ -462,8 +462,7 @@ int btrfs_get_dev_stats(struct btrfs_fs_info *fs_info,
                        struct btrfs_ioctl_get_dev_stats *stats);
 void btrfs_init_devices_late(struct btrfs_fs_info *fs_info);
 int btrfs_init_dev_stats(struct btrfs_fs_info *fs_info);
-int btrfs_run_dev_stats(struct btrfs_trans_handle *trans,
-                       struct btrfs_fs_info *fs_info);
+int btrfs_run_dev_stats(struct btrfs_trans_handle *trans);
 void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev);
 void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,
                                      struct btrfs_device *srcdev);