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, 6 insertions, 6 deletions

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 70107f7c9307..e3ad8c197997 100644
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -38,7 +38,7 @@ static int caching_kthread(void *data)
         int slot;
         int ret;
 
-        if (!btrfs_test_opt(root, INODE_MAP_CACHE))
+        if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
                 return 0;
 
         path = btrfs_alloc_path();
@@ -141,7 +141,7 @@ static void start_caching(struct btrfs_root *root)
         int ret;
         u64 objectid;
 
-        if (!btrfs_test_opt(root, INODE_MAP_CACHE))
+        if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
                 return;
 
         spin_lock(&root->ino_cache_lock);
@@ -185,7 +185,7 @@ static void start_caching(struct btrfs_root *root)
 
 int btrfs_find_free_ino(struct btrfs_root *root, u64 *objectid)
 {
-        if (!btrfs_test_opt(root, INODE_MAP_CACHE))
+        if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
                 return btrfs_find_free_objectid(root, objectid);
 
 again:
@@ -211,7 +211,7 @@ void btrfs_return_ino(struct btrfs_root *root, u64 objectid)
 {
         struct btrfs_free_space_ctl *pinned = root->free_ino_pinned;
 
-        if (!btrfs_test_opt(root, INODE_MAP_CACHE))
+        if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
                 return;
 again:
         if (root->ino_cache_state == BTRFS_CACHE_FINISHED) {
@@ -251,7 +251,7 @@ void btrfs_unpin_free_ino(struct btrfs_root *root)
         struct rb_node *n;
         u64 count;
 
-        if (!btrfs_test_opt(root, INODE_MAP_CACHE))
+        if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
                 return;
 
         while (1) {
@@ -412,7 +412,7 @@ int btrfs_save_ino_cache(struct btrfs_root *root,
         if (btrfs_root_refs(&root->root_item) == 0)
                 return 0;
 
-        if (!btrfs_test_opt(root, INODE_MAP_CACHE))
+        if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
                 return 0;
 
         path = btrfs_alloc_path();