btrfs: root->fs_info cleanup, add fs_info convenience variables

In routines where someptr->fs_info is referenced multiple times, we
introduce a convenience variable.  This makes the code considerably
more readable.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 05169ef30596..c6558ed93301 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -142,7 +142,7 @@ no_valid_dev_replace_entry_found:
                  * missing
                  */
                 if (!dev_replace->srcdev &&
-                    !btrfs_test_opt(dev_root->fs_info, DEGRADED)) {
+                    !btrfs_test_opt(fs_info, DEGRADED)) {
                         ret = -EIO;
                         btrfs_warn(fs_info,
                            "cannot mount because device replace operation is ongoing and");
@@ -151,7 +151,7 @@ no_valid_dev_replace_entry_found:
                            src_devid);
                 }
                 if (!dev_replace->tgtdev &&
-                    !btrfs_test_opt(dev_root->fs_info, DEGRADED)) {
+                    !btrfs_test_opt(fs_info, DEGRADED)) {
                         ret = -EIO;
                         btrfs_warn(fs_info,
                            "cannot mount because device replace operation is ongoing and");
@@ -387,7 +387,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, char *tgtdev_name,
         if (ret)
                 btrfs_err(fs_info, "kobj add dev failed %d", ret);
 
-        btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1);
+        btrfs_wait_ordered_roots(fs_info, -1, 0, (u64)-1);
 
         /* force writing the updated state information to disk */
         trans = btrfs_start_transaction(root, 0);
@@ -501,12 +501,12 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
          * flush all outstanding I/O and inode extent mappings before the
          * copy operation is declared as being finished
          */
-        ret = btrfs_start_delalloc_roots(root->fs_info, 0, -1);
+        ret = btrfs_start_delalloc_roots(fs_info, 0, -1);
         if (ret) {
                 mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
                 return ret;
         }
-        btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1);
+        btrfs_wait_ordered_roots(fs_info, -1, 0, (u64)-1);
 
         trans = btrfs_start_transaction(root, 0);
         if (IS_ERR(trans)) {
@@ -518,8 +518,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
 
         mutex_lock(&uuid_mutex);
         /* keep away write_all_supers() during the finishing procedure */
-        mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
-        mutex_lock(&root->fs_info->chunk_mutex);
+        mutex_lock(&fs_info->fs_devices->device_list_mutex);
+        mutex_lock(&fs_info->chunk_mutex);
         btrfs_dev_replace_lock(dev_replace, 1);
         dev_replace->replace_state =
                 scrub_ret ? BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED
@@ -535,15 +535,15 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
                                                                 src_device,
                                                                 tgt_device);
         } else {
-                btrfs_err_in_rcu(root->fs_info,
-                              "btrfs_scrub_dev(%s, %llu, %s) failed %d",
-                              src_device->missing ? "<missing disk>" :
-                                rcu_str_deref(src_device->name),
-                              src_device->devid,
-                              rcu_str_deref(tgt_device->name), scrub_ret);
+                btrfs_err_in_rcu(fs_info,
+                                 "btrfs_scrub_dev(%s, %llu, %s) failed %d",
+                                 src_device->missing ? "<missing disk>" :
+                                 rcu_str_deref(src_device->name),
+                                 src_device->devid,
+                                 rcu_str_deref(tgt_device->name), scrub_ret);
                 btrfs_dev_replace_unlock(dev_replace, 1);
-                mutex_unlock(&root->fs_info->chunk_mutex);
-                mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+                mutex_unlock(&fs_info->chunk_mutex);
+                mutex_unlock(&fs_info->fs_devices->device_list_mutex);
                 mutex_unlock(&uuid_mutex);
                 if (tgt_device)
                         btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
@@ -552,12 +552,12 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
                 return scrub_ret;
         }
 
-        btrfs_info_in_rcu(root->fs_info,
-                      "dev_replace from %s (devid %llu) to %s finished",
-                      src_device->missing ? "<missing disk>" :
-                        rcu_str_deref(src_device->name),
-                      src_device->devid,
-                      rcu_str_deref(tgt_device->name));
+        btrfs_info_in_rcu(fs_info,
+                          "dev_replace from %s (devid %llu) to %s finished",
+                          src_device->missing ? "<missing disk>" :
+                          rcu_str_deref(src_device->name),
+                          src_device->devid,
+                          rcu_str_deref(tgt_device->name));
         tgt_device->is_tgtdev_for_dev_replace = 0;
         tgt_device->devid = src_device->devid;
         src_device->devid = BTRFS_DEV_REPLACE_DEVID;
@@ -592,8 +592,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
          * superblock is scratched out so that it is no longer marked to
          * belong to this filesystem.
          */
-        mutex_unlock(&root->fs_info->chunk_mutex);
-        mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+        mutex_unlock(&fs_info->chunk_mutex);
+        mutex_unlock(&fs_info->fs_devices->device_list_mutex);
         mutex_unlock(&uuid_mutex);
 
         /* replace the sysfs entry */