btrfs: btrfs_test_opt and friends should take a btrfs_fs_info

btrfs_test_opt and friends only use the root pointer to access
the fs_info.  Let's pass the fs_info directly in preparation to
eliminate similar patterns all over btrfs.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index cb6d13c39bee..802a3113854f 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3019,8 +3019,8 @@ retry_root_backup:
         if (IS_ERR(fs_info->transaction_kthread))
                 goto fail_cleaner;
 
-        if (!btrfs_test_opt(tree_root, SSD) &&
-            !btrfs_test_opt(tree_root, NOSSD) &&
+        if (!btrfs_test_opt(tree_root->fs_info, SSD) &&
+            !btrfs_test_opt(tree_root->fs_info, NOSSD) &&
             !fs_info->fs_devices->rotating) {
                 btrfs_info(fs_info, "detected SSD devices, enabling SSD mode");
                 btrfs_set_opt(fs_info->mount_opt, SSD);
@@ -3033,9 +3033,9 @@ retry_root_backup:
         btrfs_apply_pending_changes(fs_info);
 
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
-        if (btrfs_test_opt(tree_root, CHECK_INTEGRITY)) {
+        if (btrfs_test_opt(tree_root->fs_info, CHECK_INTEGRITY)) {
                 ret = btrfsic_mount(tree_root, fs_devices,
-                                    btrfs_test_opt(tree_root,
+                                    btrfs_test_opt(tree_root->fs_info,
                                         CHECK_INTEGRITY_INCLUDING_EXTENT_DATA) ?
                                     1 : 0,
                                     fs_info->check_integrity_print_mask);
@@ -3051,7 +3051,7 @@ retry_root_backup:
 
         /* do not make disk changes in broken FS or nologreplay is given */
         if (btrfs_super_log_root(disk_super) != 0 &&
-            !btrfs_test_opt(tree_root, NOLOGREPLAY)) {
+            !btrfs_test_opt(tree_root->fs_info, NOLOGREPLAY)) {
                 ret = btrfs_replay_log(fs_info, fs_devices);
                 if (ret) {
                         err = ret;
@@ -3092,7 +3092,7 @@ retry_root_backup:
         if (sb->s_flags & MS_RDONLY)
                 return 0;
 
-        if (btrfs_test_opt(tree_root, FREE_SPACE_TREE) &&
+        if (btrfs_test_opt(tree_root->fs_info, FREE_SPACE_TREE) &&
             !btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) {
                 btrfs_info(fs_info, "creating free space tree");
                 ret = btrfs_create_free_space_tree(fs_info);
@@ -3129,7 +3129,7 @@ retry_root_backup:
 
         btrfs_qgroup_rescan_resume(fs_info);
 
-        if (btrfs_test_opt(tree_root, CLEAR_CACHE) &&
+        if (btrfs_test_opt(tree_root->fs_info, CLEAR_CACHE) &&
             btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) {
                 btrfs_info(fs_info, "clearing free space tree");
                 ret = btrfs_clear_free_space_tree(fs_info);
@@ -3150,7 +3150,7 @@ retry_root_backup:
                         close_ctree(tree_root);
                         return ret;
                 }
-        } else if (btrfs_test_opt(tree_root, RESCAN_UUID_TREE) ||
+        } else if (btrfs_test_opt(tree_root->fs_info, RESCAN_UUID_TREE) ||
                    fs_info->generation !=
                                 btrfs_super_uuid_tree_generation(disk_super)) {
                 btrfs_info(fs_info, "checking UUID tree");
@@ -3227,7 +3227,7 @@ fail:
         return err;
 
 recovery_tree_root:
-        if (!btrfs_test_opt(tree_root, USEBACKUPROOT))
+        if (!btrfs_test_opt(tree_root->fs_info, USEBACKUPROOT))
                 goto fail_tree_roots;
 
         free_root_pointers(fs_info, 0);
@@ -3642,7 +3642,7 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors)
         int total_errors = 0;
         u64 flags;
 
-        do_barriers = !btrfs_test_opt(root, NOBARRIER);
+        do_barriers = !btrfs_test_opt(root->fs_info, NOBARRIER);
         backup_super_roots(root->fs_info);
 
         sb = root->fs_info->super_for_commit;
@@ -3926,7 +3926,7 @@ void close_ctree(struct btrfs_root *root)
         iput(fs_info->btree_inode);
 
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
-        if (btrfs_test_opt(root, CHECK_INTEGRITY))
+        if (btrfs_test_opt(root->fs_info, CHECK_INTEGRITY))
                 btrfsic_unmount(root, fs_info->fs_devices);
 #endif