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

[mirror_ubuntu-hirsute-kernel.git] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 0c4926728b6a3ca3def540ae9bd966e088d04a13..79921f6fb8e515af1aac71fe6d079f57036953eb 100644 (file)
--- 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->fs_info, INODE_MAP_CACHE))
+       if (!btrfs_test_opt(fs_info, INODE_MAP_CACHE))
                return 0;
 
        path = btrfs_alloc_path();
@@ -180,7 +180,7 @@ static void start_caching(struct btrfs_root *root)
        if (IS_ERR(tsk)) {
                btrfs_warn(fs_info, "failed to start inode caching task");
                btrfs_clear_pending_and_info(fs_info, INODE_MAP_CACHE,
-                               "disabling inode map caching");
+                                            "disabling inode map caching");
        }
 }
 
@@ -395,6 +395,7 @@ void btrfs_init_free_ino_ctl(struct btrfs_root *root)
 int btrfs_save_ino_cache(struct btrfs_root *root,
                         struct btrfs_trans_handle *trans)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_free_space_ctl *ctl = root->free_ino_ctl;
        struct btrfs_path *path;
        struct inode *inode;
@@ -415,7 +416,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->fs_info, INODE_MAP_CACHE))
+       if (!btrfs_test_opt(fs_info, INODE_MAP_CACHE))
                return 0;
 
        path = btrfs_alloc_path();
@@ -423,7 +424,7 @@ int btrfs_save_ino_cache(struct btrfs_root *root,
                return -ENOMEM;
 
        rsv = trans->block_rsv;
-       trans->block_rsv = &root->fs_info->trans_block_rsv;
+       trans->block_rsv = &fs_info->trans_block_rsv;
 
        num_bytes = trans->bytes_reserved;
        /*
@@ -433,15 +434,14 @@ int btrfs_save_ino_cache(struct btrfs_root *root,
         * 1 item for free space object
         * 3 items for pre-allocation
         */
-       trans->bytes_reserved = btrfs_calc_trans_metadata_size(root->fs_info,
-                                                              10);
+       trans->bytes_reserved = btrfs_calc_trans_metadata_size(fs_info, 10);
        ret = btrfs_block_rsv_add(root, trans->block_rsv,
                                  trans->bytes_reserved,
                                  BTRFS_RESERVE_NO_FLUSH);
        if (ret)
                goto out;
-       trace_btrfs_space_reservation(root->fs_info, "ino_cache",
-                                     trans->transid, trans->bytes_reserved, 1);
+       trace_btrfs_space_reservation(fs_info, "ino_cache", trans->transid,
+                                     trans->bytes_reserved, 1);
 again:
        inode = lookup_free_ino_inode(root, path);
        if (IS_ERR(inode) && (PTR_ERR(inode) != -ENOENT || retry)) {
@@ -507,8 +507,8 @@ again:
 out_put:
        iput(inode);
 out_release:
-       trace_btrfs_space_reservation(root->fs_info, "ino_cache",
-                                     trans->transid, trans->bytes_reserved, 0);
+       trace_btrfs_space_reservation(fs_info, "ino_cache", trans->transid,
+                                     trans->bytes_reserved, 0);
        btrfs_block_rsv_release(root, trans->block_rsv, trans->bytes_reserved);
 out:
        trans->block_rsv = rsv;