]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: root->fs_info cleanup, add fs_info convenience variables
authorJeff Mahoney <jeffm@suse.com>
Wed, 22 Jun 2016 22:54:23 +0000 (18:54 -0400)
committerDavid Sterba <dsterba@suse.com>
Tue, 6 Dec 2016 15:06:59 +0000 (16:06 +0100)
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>
33 files changed:
fs/btrfs/check-integrity.c
fs/btrfs/compression.c
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/delayed-inode.c
fs/btrfs/dev-replace.c
fs/btrfs/dir-item.c
fs/btrfs/disk-io.c
fs/btrfs/export.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/file-item.c
fs/btrfs/file.c
fs/btrfs/free-space-cache.c
fs/btrfs/free-space-tree.c
fs/btrfs/inode-item.c
fs/btrfs/inode-map.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/ordered-data.c
fs/btrfs/print-tree.c
fs/btrfs/qgroup.c
fs/btrfs/raid56.c
fs/btrfs/reada.c
fs/btrfs/relocation.c
fs/btrfs/root-tree.c
fs/btrfs/scrub.c
fs/btrfs/send.c
fs/btrfs/super.c
fs/btrfs/transaction.c
fs/btrfs/tree-log.c
fs/btrfs/uuid-tree.c
fs/btrfs/volumes.c

index a6243ccd9800c278caea6c0865e02c05e25ff72b..137883cce13c8917790706d1329b5ecd028044b6 100644 (file)
@@ -646,11 +646,12 @@ static struct btrfsic_dev_state *btrfsic_dev_state_hashtable_lookup(
 static int btrfsic_process_superblock(struct btrfsic_state *state,
                                      struct btrfs_fs_devices *fs_devices)
 {
-       int ret = 0;
+       struct btrfs_fs_info *fs_info = state->fs_info;
        struct btrfs_super_block *selected_super;
        struct list_head *dev_head = &fs_devices->devices;
        struct btrfs_device *device;
        struct btrfsic_dev_state *selected_dev_state = NULL;
+       int ret = 0;
        int pass;
 
        BUG_ON(NULL == state);
@@ -716,9 +717,8 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
                        break;
                }
 
-               num_copies =
-                   btrfs_num_copies(state->fs_info,
-                                    next_bytenr, state->metablock_size);
+               num_copies = btrfs_num_copies(fs_info, next_bytenr,
+                                             state->metablock_size);
                if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
                        pr_info("num_copies(log_bytenr=%llu) = %d\n",
                               next_bytenr, num_copies);
@@ -783,6 +783,7 @@ static int btrfsic_process_superblock_dev_mirror(
                struct btrfsic_dev_state **selected_dev_state,
                struct btrfs_super_block *selected_super)
 {
+       struct btrfs_fs_info *fs_info = state->fs_info;
        struct btrfs_super_block *super_tmp;
        u64 dev_bytenr;
        struct buffer_head *bh;
@@ -832,7 +833,7 @@ static int btrfsic_process_superblock_dev_mirror(
                superblock_tmp->never_written = 0;
                superblock_tmp->mirror_num = 1 + superblock_mirror_num;
                if (state->print_mask & BTRFSIC_PRINT_MASK_SUPERBLOCK_WRITE)
-                       btrfs_info_in_rcu(device->fs_info,
+                       btrfs_info_in_rcu(fs_info,
                                "new initial S-block (bdev %p, %s) @%llu (%s/%llu/%d)",
                                     superblock_bdev,
                                     rcu_str_deref(device->name), dev_bytenr,
@@ -887,9 +888,8 @@ static int btrfsic_process_superblock_dev_mirror(
                        break;
                }
 
-               num_copies =
-                   btrfs_num_copies(state->fs_info,
-                                    next_bytenr, state->metablock_size);
+               num_copies = btrfs_num_copies(fs_info, next_bytenr,
+                                             state->metablock_size);
                if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
                        pr_info("num_copies(log_bytenr=%llu) = %d\n",
                               next_bytenr, num_copies);
@@ -1254,6 +1254,7 @@ static int btrfsic_create_link_to_next_block(
                struct btrfs_disk_key *disk_key,
                u64 parent_generation)
 {
+       struct btrfs_fs_info *fs_info = state->fs_info;
        struct btrfsic_block *next_block = NULL;
        int ret;
        struct btrfsic_block_link *l;
@@ -1262,9 +1263,8 @@ static int btrfsic_create_link_to_next_block(
 
        *next_blockp = NULL;
        if (0 == *num_copiesp) {
-               *num_copiesp =
-                   btrfs_num_copies(state->fs_info,
-                                    next_bytenr, state->metablock_size);
+               *num_copiesp = btrfs_num_copies(fs_info, next_bytenr,
+                                               state->metablock_size);
                if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
                        pr_info("num_copies(log_bytenr=%llu) = %d\n",
                               next_bytenr, *num_copiesp);
@@ -1390,13 +1390,14 @@ static int btrfsic_handle_extent_data(
                struct btrfsic_block_data_ctx *block_ctx,
                u32 item_offset, int force_iodone_flag)
 {
-       int ret;
+       struct btrfs_fs_info *fs_info = state->fs_info;
        struct btrfs_file_extent_item file_extent_item;
        u64 file_extent_item_offset;
        u64 next_bytenr;
        u64 num_bytes;
        u64 generation;
        struct btrfsic_block_link *l;
+       int ret;
 
        file_extent_item_offset = offsetof(struct btrfs_leaf, items) +
                                  item_offset;
@@ -1456,9 +1457,8 @@ static int btrfsic_handle_extent_data(
                else
                        chunk_len = num_bytes;
 
-               num_copies =
-                   btrfs_num_copies(state->fs_info,
-                                    next_bytenr, state->datablock_size);
+               num_copies = btrfs_num_copies(fs_info, next_bytenr,
+                                             state->datablock_size);
                if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
                        pr_info("num_copies(log_bytenr=%llu) = %d\n",
                               next_bytenr, num_copies);
@@ -1533,13 +1533,14 @@ static int btrfsic_map_block(struct btrfsic_state *state, u64 bytenr, u32 len,
                             struct btrfsic_block_data_ctx *block_ctx_out,
                             int mirror_num)
 {
+       struct btrfs_fs_info *fs_info = state->fs_info;
        int ret;
        u64 length;
        struct btrfs_bio *multi = NULL;
        struct btrfs_device *device;
 
        length = len;
-       ret = btrfs_map_block(state->fs_info, BTRFS_MAP_READ,
+       ret = btrfs_map_block(fs_info, BTRFS_MAP_READ,
                              bytenr, &length, &multi, mirror_num);
 
        if (ret) {
@@ -1731,6 +1732,7 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
 static int btrfsic_test_for_metadata(struct btrfsic_state *state,
                                     char **datav, unsigned int num_pages)
 {
+       struct btrfs_fs_info *fs_info = state->fs_info;
        struct btrfs_header *h;
        u8 csum[BTRFS_CSUM_SIZE];
        u32 crc = ~(u32)0;
@@ -1741,7 +1743,7 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state,
        num_pages = state->metablock_size >> PAGE_SHIFT;
        h = (struct btrfs_header *)datav[0];
 
-       if (memcmp(h->fsid, state->fs_info->fsid, BTRFS_UUID_SIZE))
+       if (memcmp(h->fsid, fs_info->fsid, BTRFS_UUID_SIZE))
                return 1;
 
        for (i = 0; i < num_pages; i++) {
@@ -2202,6 +2204,7 @@ static int btrfsic_process_written_superblock(
                struct btrfsic_block *const superblock,
                struct btrfs_super_block *const super_hdr)
 {
+       struct btrfs_fs_info *fs_info = state->fs_info;
        int pass;
 
        superblock->generation = btrfs_super_generation(super_hdr);
@@ -2275,9 +2278,8 @@ static int btrfsic_process_written_superblock(
                        break;
                }
 
-               num_copies =
-                   btrfs_num_copies(state->fs_info,
-                                    next_bytenr, BTRFS_SUPER_INFO_SIZE);
+               num_copies = btrfs_num_copies(fs_info, next_bytenr,
+                                             BTRFS_SUPER_INFO_SIZE);
                if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
                        pr_info("num_copies(log_bytenr=%llu) = %d\n",
                               next_bytenr, num_copies);
@@ -2699,14 +2701,14 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
                                           struct btrfsic_dev_state *dev_state,
                                           u64 dev_bytenr)
 {
+       struct btrfs_fs_info *fs_info = state->fs_info;
+       struct btrfsic_block_data_ctx block_ctx;
        int num_copies;
        int mirror_num;
-       int ret;
-       struct btrfsic_block_data_ctx block_ctx;
        int match = 0;
+       int ret;
 
-       num_copies = btrfs_num_copies(state->fs_info,
-                                     bytenr, state->metablock_size);
+       num_copies = btrfs_num_copies(fs_info, bytenr, state->metablock_size);
 
        for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
                ret = btrfsic_map_block(state, bytenr, state->metablock_size,
@@ -2909,16 +2911,17 @@ int btrfsic_mount(struct btrfs_root *root,
        int ret;
        struct btrfsic_state *state;
        struct list_head *dev_head = &fs_devices->devices;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_device *device;
 
-       if (root->fs_info->nodesize & ((u64)PAGE_SIZE - 1)) {
+       if (fs_info->nodesize & ((u64)PAGE_SIZE - 1)) {
                pr_info("btrfsic: cannot handle nodesize %d not being a multiple of PAGE_SIZE %ld!\n",
-                      root->fs_info->nodesize, PAGE_SIZE);
+                      fs_info->nodesize, PAGE_SIZE);
                return -1;
        }
-       if (root->fs_info->sectorsize & ((u64)PAGE_SIZE - 1)) {
+       if (fs_info->sectorsize & ((u64)PAGE_SIZE - 1)) {
                pr_info("btrfsic: cannot handle sectorsize %d not being a multiple of PAGE_SIZE %ld!\n",
-                      root->fs_info->sectorsize, PAGE_SIZE);
+                      fs_info->sectorsize, PAGE_SIZE);
                return -1;
        }
        state = kzalloc(sizeof(*state), GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
@@ -2940,8 +2943,8 @@ int btrfsic_mount(struct btrfs_root *root,
        state->print_mask = print_mask;
        state->include_extent_data = including_extent_data;
        state->csum_size = 0;
-       state->metablock_size = root->fs_info->nodesize;
-       state->datablock_size = root->fs_info->sectorsize;
+       state->metablock_size = fs_info->nodesize;
+       state->datablock_size = fs_info->sectorsize;
        INIT_LIST_HEAD(&state->all_blocks_list);
        btrfsic_block_hashtable_init(&state->block_hashtable);
        btrfsic_block_link_hashtable_init(&state->block_link_hashtable);
index e4a8c3a085db2d4ebb5f6fe69c29feda5814ee77..750bae4a46da5b2507a88592bb1dc7761a4fdfc5 100644 (file)
@@ -88,10 +88,11 @@ static int btrfs_decompress_bio(int type, struct page **pages_in,
 static inline int compressed_bio_size(struct btrfs_root *root,
                                      unsigned long disk_size)
 {
-       u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
 
        return sizeof(struct compressed_bio) +
-               (DIV_ROUND_UP(disk_size, root->fs_info->sectorsize)) * csum_size;
+               (DIV_ROUND_UP(disk_size, fs_info->sectorsize)) * csum_size;
 }
 
 static struct bio *compressed_bio_alloc(struct block_device *bdev,
@@ -328,6 +329,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
                                 struct page **compressed_pages,
                                 unsigned long nr_pages)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct bio *bio = NULL;
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct compressed_bio *cb;
@@ -355,7 +357,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
        cb->orig_bio = NULL;
        cb->nr_pages = nr_pages;
 
-       bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
+       bdev = fs_info->fs_devices->latest_bdev;
 
        bio = compressed_bio_alloc(bdev, first_byte, GFP_NOFS);
        if (!bio) {
@@ -391,8 +393,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
                         * freed before we're done setting it up
                         */
                        atomic_inc(&cb->pending_bios);
-                       ret = btrfs_bio_wq_end_io(root->fs_info, bio,
-                                       BTRFS_WQ_ENDIO_DATA);
+                       ret = btrfs_bio_wq_end_io(fs_info, bio,
+                                                 BTRFS_WQ_ENDIO_DATA);
                        BUG_ON(ret); /* -ENOMEM */
 
                        if (!skip_sum) {
@@ -417,7 +419,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
                        bio_add_page(bio, page, PAGE_SIZE, 0);
                }
                if (bytes_left < PAGE_SIZE) {
-                       btrfs_info(BTRFS_I(inode)->root->fs_info,
+                       btrfs_info(fs_info,
                                        "bytes left %lu compress len %lu nr %lu",
                               bytes_left, cb->compressed_len, cb->nr_pages);
                }
@@ -427,7 +429,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
        }
        bio_get(bio);
 
-       ret = btrfs_bio_wq_end_io(root->fs_info, bio, BTRFS_WQ_ENDIO_DATA);
+       ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA);
        BUG_ON(ret); /* -ENOMEM */
 
        if (!skip_sum) {
@@ -575,6 +577,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
 int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                                 int mirror_num, unsigned long bio_flags)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct extent_io_tree *tree;
        struct extent_map_tree *em_tree;
        struct compressed_bio *cb;
@@ -634,7 +637,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
        if (!cb->compressed_pages)
                goto fail1;
 
-       bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
+       bdev = fs_info->fs_devices->latest_bdev;
 
        for (pg_index = 0; pg_index < nr_pages; pg_index++) {
                cb->compressed_pages[pg_index] = alloc_page(GFP_NOFS |
@@ -678,8 +681,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                    PAGE_SIZE) {
                        bio_get(comp_bio);
 
-                       ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio,
-                                       BTRFS_WQ_ENDIO_DATA);
+                       ret = btrfs_bio_wq_end_io(fs_info, comp_bio,
+                                                 BTRFS_WQ_ENDIO_DATA);
                        BUG_ON(ret); /* -ENOMEM */
 
                        /*
@@ -696,7 +699,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                                BUG_ON(ret); /* -ENOMEM */
                        }
                        sums += DIV_ROUND_UP(comp_bio->bi_iter.bi_size,
-                                            root->fs_info->sectorsize);
+                                            fs_info->sectorsize);
 
                        ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);
                        if (ret) {
@@ -719,8 +722,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
        }
        bio_get(comp_bio);
 
-       ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio,
-                       BTRFS_WQ_ENDIO_DATA);
+       ret = btrfs_bio_wq_end_io(fs_info, comp_bio, BTRFS_WQ_ENDIO_DATA);
        BUG_ON(ret); /* -ENOMEM */
 
        if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {
index 431b150a823ac3e2f581c9f883b77e9f63ea43e2..b29c8d82e7414b654f412496fcbaa29f8e814271 100644 (file)
@@ -212,21 +212,23 @@ static struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)
  */
 static void add_root_to_dirty_list(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        if (test_bit(BTRFS_ROOT_DIRTY, &root->state) ||
            !test_bit(BTRFS_ROOT_TRACK_DIRTY, &root->state))
                return;
 
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
        if (!test_and_set_bit(BTRFS_ROOT_DIRTY, &root->state)) {
                /* Want the extent tree to be the last on the list */
                if (root->objectid == BTRFS_EXTENT_TREE_OBJECTID)
                        list_move_tail(&root->dirty_list,
-                                      &root->fs_info->dirty_cowonly_roots);
+                                      &fs_info->dirty_cowonly_roots);
                else
                        list_move(&root->dirty_list,
-                                 &root->fs_info->dirty_cowonly_roots);
+                                 &fs_info->dirty_cowonly_roots);
        }
-       spin_unlock(&root->fs_info->trans_lock);
+       spin_unlock(&fs_info->trans_lock);
 }
 
 /*
@@ -239,13 +241,14 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
                      struct extent_buffer *buf,
                      struct extent_buffer **cow_ret, u64 new_root_objectid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *cow;
        int ret = 0;
        int level;
        struct btrfs_disk_key disk_key;
 
        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
-               trans->transid != root->fs_info->running_transaction->transid);
+               trans->transid != fs_info->running_transaction->transid);
        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
                trans->transid != root->last_trans);
 
@@ -271,7 +274,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
        else
                btrfs_set_header_owner(cow, new_root_objectid);
 
-       write_extent_buffer_fsid(cow, root->fs_info->fsid);
+       write_extent_buffer_fsid(cow, fs_info->fsid);
 
        WARN_ON(btrfs_header_generation(buf) > trans->transid);
        if (new_root_objectid == BTRFS_TREE_RELOC_OBJECTID)
@@ -977,6 +980,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                                       struct extent_buffer *cow,
                                       int *last_ref)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 refs;
        u64 owner;
        u64 flags;
@@ -1008,7 +1012,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                        return ret;
                if (refs == 0) {
                        ret = -EROFS;
-                       btrfs_handle_fs_error(root->fs_info, ret, NULL);
+                       btrfs_handle_fs_error(fs_info, ret, NULL);
                        return ret;
                }
        } else {
@@ -1069,7 +1073,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                        ret = btrfs_dec_ref(trans, root, buf, 1);
                        BUG_ON(ret); /* -ENOMEM */
                }
-               clean_tree_block(trans, root->fs_info, buf);
+               clean_tree_block(trans, fs_info, buf);
                *last_ref = 1;
        }
        return 0;
@@ -1094,6 +1098,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
                             struct extent_buffer **cow_ret,
                             u64 search_start, u64 empty_size)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_disk_key disk_key;
        struct extent_buffer *cow;
        int level, ret;
@@ -1107,7 +1112,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
        btrfs_assert_tree_locked(buf);
 
        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
-               trans->transid != root->fs_info->running_transaction->transid);
+               trans->transid != fs_info->running_transaction->transid);
        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
                trans->transid != root->last_trans);
 
@@ -1140,7 +1145,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
        else
                btrfs_set_header_owner(cow, root->root_key.objectid);
 
-       write_extent_buffer_fsid(cow, root->fs_info->fsid);
+       write_extent_buffer_fsid(cow, fs_info->fsid);
 
        ret = update_ref_for_cow(trans, root, buf, cow, &last_ref);
        if (ret) {
@@ -1172,7 +1177,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
                add_root_to_dirty_list(root);
        } else {
                WARN_ON(trans->transid != btrfs_header_generation(parent));
-               tree_mod_log_insert_key(root->fs_info, parent, parent_slot,
+               tree_mod_log_insert_key(fs_info, parent, parent_slot,
                                        MOD_LOG_KEY_REPLACE, GFP_NOFS);
                btrfs_set_node_blockptr(parent, parent_slot,
                                        cow->start);
@@ -1180,7 +1185,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
                                              trans->transid);
                btrfs_mark_buffer_dirty(parent);
                if (last_ref) {
-                       ret = tree_mod_log_free_eb(root->fs_info, buf);
+                       ret = tree_mod_log_free_eb(fs_info, buf);
                        if (ret) {
                                btrfs_abort_transaction(trans, ret);
                                return ret;
@@ -1400,6 +1405,7 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
 static inline struct extent_buffer *
 get_old_root(struct btrfs_root *root, u64 time_seq)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct tree_mod_elem *tm;
        struct extent_buffer *eb = NULL;
        struct extent_buffer *eb_root;
@@ -1409,7 +1415,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
        u64 logical;
 
        eb_root = btrfs_read_lock_root_node(root);
-       tm = __tree_mod_log_oldest_root(root->fs_info, eb_root, time_seq);
+       tm = __tree_mod_log_oldest_root(fs_info, eb_root, time_seq);
        if (!tm)
                return eb_root;
 
@@ -1421,7 +1427,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
                logical = eb_root->start;
        }
 
-       tm = tree_mod_log_search(root->fs_info, logical, time_seq);
+       tm = tree_mod_log_search(fs_info, logical, time_seq);
        if (old_root && tm && tm->op != MOD_LOG_KEY_REMOVE_WHILE_FREEING) {
                btrfs_tree_read_unlock(eb_root);
                free_extent_buffer(eb_root);
@@ -1429,8 +1435,9 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
                if (WARN_ON(IS_ERR(old) || !extent_buffer_uptodate(old))) {
                        if (!IS_ERR(old))
                                free_extent_buffer(old);
-                       btrfs_warn(root->fs_info,
-                               "failed to read tree block %llu from get_old_root", logical);
+                       btrfs_warn(fs_info,
+                                  "failed to read tree block %llu from get_old_root",
+                                  logical);
                } else {
                        eb = btrfs_clone_extent_buffer(old);
                        free_extent_buffer(old);
@@ -1438,7 +1445,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
        } else if (old_root) {
                btrfs_tree_read_unlock(eb_root);
                free_extent_buffer(eb_root);
-               eb = alloc_dummy_extent_buffer(root->fs_info, logical);
+               eb = alloc_dummy_extent_buffer(fs_info, logical);
        } else {
                btrfs_set_lock_blocking_rw(eb_root, BTRFS_READ_LOCK);
                eb = btrfs_clone_extent_buffer(eb_root);
@@ -1458,10 +1465,10 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
                btrfs_set_header_generation(eb, old_generation);
        }
        if (tm)
-               __tree_mod_log_rewind(root->fs_info, eb, time_seq, tm);
+               __tree_mod_log_rewind(fs_info, eb, time_seq, tm);
        else
                WARN_ON(btrfs_header_level(eb) != 0);
-       WARN_ON(btrfs_header_nritems(eb) > BTRFS_NODEPTRS_PER_BLOCK(root->fs_info));
+       WARN_ON(btrfs_header_nritems(eb) > BTRFS_NODEPTRS_PER_BLOCK(fs_info));
 
        return eb;
 }
@@ -1523,17 +1530,18 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
                    struct extent_buffer *parent, int parent_slot,
                    struct extent_buffer **cow_ret)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 search_start;
        int ret;
 
-       if (trans->transaction != root->fs_info->running_transaction)
+       if (trans->transaction != fs_info->running_transaction)
                WARN(1, KERN_CRIT "trans %llu running %llu\n",
                       trans->transid,
-                      root->fs_info->running_transaction->transid);
+                      fs_info->running_transaction->transid);
 
-       if (trans->transid != root->fs_info->generation)
+       if (trans->transid != fs_info->generation)
                WARN(1, KERN_CRIT "trans %llu running %llu\n",
-                      trans->transid, root->fs_info->generation);
+                      trans->transid, fs_info->generation);
 
        if (!should_cow_block(trans, root, buf)) {
                trans->dirty = true;
@@ -1610,6 +1618,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
                       int start_slot, u64 *last_ret,
                       struct btrfs_key *progress)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *cur;
        u64 blocknr;
        u64 gen;
@@ -1628,11 +1637,11 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
 
        parent_level = btrfs_header_level(parent);
 
-       WARN_ON(trans->transaction != root->fs_info->running_transaction);
-       WARN_ON(trans->transid != root->fs_info->generation);
+       WARN_ON(trans->transaction != fs_info->running_transaction);
+       WARN_ON(trans->transid != fs_info->generation);
 
        parent_nritems = btrfs_header_nritems(parent);
-       blocksize = root->fs_info->nodesize;
+       blocksize = fs_info->nodesize;
        end_slot = parent_nritems - 1;
 
        if (parent_nritems <= 1)
@@ -1666,7 +1675,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
                        continue;
                }
 
-               cur = find_extent_buffer(root->fs_info, blocknr);
+               cur = find_extent_buffer(fs_info, blocknr);
                if (cur)
                        uptodate = btrfs_buffer_uptodate(cur, gen, 0);
                else
@@ -1711,7 +1720,6 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
        return err;
 }
 
-
 /*
  * search for key in the extent_buffer.  The items start at offset p,
  * and they are item_size apart.  There are 'max' items in p.
@@ -1865,6 +1873,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                         struct btrfs_root *root,
                         struct btrfs_path *path, int level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *right = NULL;
        struct extent_buffer *mid;
        struct extent_buffer *left = NULL;
@@ -1905,7 +1914,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                child = read_node_slot(root, mid, 0);
                if (IS_ERR(child)) {
                        ret = PTR_ERR(child);
-                       btrfs_handle_fs_error(root->fs_info, ret, NULL);
+                       btrfs_handle_fs_error(fs_info, ret, NULL);
                        goto enospc;
                }
 
@@ -1926,7 +1935,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
 
                path->locks[level] = 0;
                path->nodes[level] = NULL;
-               clean_tree_block(trans, root->fs_info, mid);
+               clean_tree_block(trans, fs_info, mid);
                btrfs_tree_unlock(mid);
                /* once for the path */
                free_extent_buffer(mid);
@@ -1938,7 +1947,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                return 0;
        }
        if (btrfs_header_nritems(mid) >
-           BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) / 4)
+           BTRFS_NODEPTRS_PER_BLOCK(fs_info) / 4)
                return 0;
 
        left = read_node_slot(root, parent, pslot - 1);
@@ -1987,7 +1996,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                if (wret < 0 && wret != -ENOSPC)
                        ret = wret;
                if (btrfs_header_nritems(right) == 0) {
-                       clean_tree_block(trans, root->fs_info, right);
+                       clean_tree_block(trans, fs_info, right);
                        btrfs_tree_unlock(right);
                        del_ptr(root, path, level + 1, pslot + 1);
                        root_sub_used(root, right->len);
@@ -1997,7 +2006,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                } else {
                        struct btrfs_disk_key right_key;
                        btrfs_node_key(right, &right_key, 0);
-                       tree_mod_log_set_node_key(root->fs_info, parent,
+                       tree_mod_log_set_node_key(fs_info, parent,
                                                  pslot + 1, 0);
                        btrfs_set_node_key(parent, &right_key, pslot + 1);
                        btrfs_mark_buffer_dirty(parent);
@@ -2015,7 +2024,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                 */
                if (!left) {
                        ret = -EROFS;
-                       btrfs_handle_fs_error(root->fs_info, ret, NULL);
+                       btrfs_handle_fs_error(fs_info, ret, NULL);
                        goto enospc;
                }
                wret = balance_node_right(trans, root, mid, left);
@@ -2031,7 +2040,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                BUG_ON(wret == 1);
        }
        if (btrfs_header_nritems(mid) == 0) {
-               clean_tree_block(trans, root->fs_info, mid);
+               clean_tree_block(trans, fs_info, mid);
                btrfs_tree_unlock(mid);
                del_ptr(root, path, level + 1, pslot);
                root_sub_used(root, mid->len);
@@ -2042,8 +2051,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                /* update the parent key to reflect our changes */
                struct btrfs_disk_key mid_key;
                btrfs_node_key(mid, &mid_key, 0);
-               tree_mod_log_set_node_key(root->fs_info, parent,
-                                         pslot, 0);
+               tree_mod_log_set_node_key(fs_info, parent, pslot, 0);
                btrfs_set_node_key(parent, &mid_key, pslot);
                btrfs_mark_buffer_dirty(parent);
        }
@@ -2090,6 +2098,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
                                          struct btrfs_root *root,
                                          struct btrfs_path *path, int level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *right = NULL;
        struct extent_buffer *mid;
        struct extent_buffer *left = NULL;
@@ -2125,7 +2134,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
                btrfs_set_lock_blocking(left);
 
                left_nr = btrfs_header_nritems(left);
-               if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - 1) {
+               if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) {
                        wret = 1;
                } else {
                        ret = btrfs_cow_block(trans, root, left, parent,
@@ -2143,8 +2152,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
                        struct btrfs_disk_key disk_key;
                        orig_slot += left_nr;
                        btrfs_node_key(mid, &disk_key, 0);
-                       tree_mod_log_set_node_key(root->fs_info, parent,
-                                                 pslot, 0);
+                       tree_mod_log_set_node_key(fs_info, parent, pslot, 0);
                        btrfs_set_node_key(parent, &disk_key, pslot);
                        btrfs_mark_buffer_dirty(parent);
                        if (btrfs_header_nritems(left) > orig_slot) {
@@ -2179,7 +2187,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
                btrfs_set_lock_blocking(right);
 
                right_nr = btrfs_header_nritems(right);
-               if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - 1) {
+               if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) {
                        wret = 1;
                } else {
                        ret = btrfs_cow_block(trans, root, right,
@@ -2198,7 +2206,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
                        struct btrfs_disk_key disk_key;
 
                        btrfs_node_key(right, &disk_key, 0);
-                       tree_mod_log_set_node_key(root->fs_info, parent,
+                       tree_mod_log_set_node_key(fs_info, parent,
                                                  pslot + 1, 0);
                        btrfs_set_node_key(parent, &disk_key, pslot + 1);
                        btrfs_mark_buffer_dirty(parent);
@@ -2230,6 +2238,7 @@ static void reada_for_search(struct btrfs_root *root,
                             struct btrfs_path *path,
                             int level, int slot, u64 objectid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *node;
        struct btrfs_disk_key disk_key;
        u32 nritems;
@@ -2250,8 +2259,8 @@ static void reada_for_search(struct btrfs_root *root,
        node = path->nodes[level];
 
        search = btrfs_node_blockptr(node, slot);
-       blocksize = root->fs_info->nodesize;
-       eb = find_extent_buffer(root->fs_info, search);
+       blocksize = fs_info->nodesize;
+       eb = find_extent_buffer(fs_info, search);
        if (eb) {
                free_extent_buffer(eb);
                return;
@@ -2292,6 +2301,7 @@ static void reada_for_search(struct btrfs_root *root,
 static noinline void reada_for_balance(struct btrfs_root *root,
                                       struct btrfs_path *path, int level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int slot;
        int nritems;
        struct extent_buffer *parent;
@@ -2310,7 +2320,7 @@ static noinline void reada_for_balance(struct btrfs_root *root,
        if (slot > 0) {
                block1 = btrfs_node_blockptr(parent, slot - 1);
                gen = btrfs_node_ptr_generation(parent, slot - 1);
-               eb = find_extent_buffer(root->fs_info, block1);
+               eb = find_extent_buffer(fs_info, block1);
                /*
                 * if we get -eagain from btrfs_buffer_uptodate, we
                 * don't want to return eagain here.  That will loop
@@ -2323,7 +2333,7 @@ static noinline void reada_for_balance(struct btrfs_root *root,
        if (slot + 1 < nritems) {
                block2 = btrfs_node_blockptr(parent, slot + 1);
                gen = btrfs_node_ptr_generation(parent, slot + 1);
-               eb = find_extent_buffer(root->fs_info, block2);
+               eb = find_extent_buffer(fs_info, block2);
                if (eb && btrfs_buffer_uptodate(eb, gen, 1) != 0)
                        block2 = 0;
                free_extent_buffer(eb);
@@ -2432,6 +2442,7 @@ read_block_for_search(struct btrfs_trans_handle *trans,
                       struct extent_buffer **eb_ret, int level, int slot,
                       struct btrfs_key *key, u64 time_seq)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 blocknr;
        u64 gen;
        struct extent_buffer *b = *eb_ret;
@@ -2441,7 +2452,7 @@ read_block_for_search(struct btrfs_trans_handle *trans,
        blocknr = btrfs_node_blockptr(b, slot);
        gen = btrfs_node_ptr_generation(b, slot);
 
-       tmp = find_extent_buffer(root->fs_info, blocknr);
+       tmp = find_extent_buffer(fs_info, blocknr);
        if (tmp) {
                /* first we do an atomic uptodate check */
                if (btrfs_buffer_uptodate(tmp, gen, 1) > 0) {
@@ -2517,9 +2528,11 @@ setup_nodes_for_search(struct btrfs_trans_handle *trans,
                       struct extent_buffer *b, int level, int ins_len,
                       int *write_lock_level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
+
        if ((p->search_for_split || ins_len > 0) && btrfs_header_nritems(b) >=
-           BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - 3) {
+           BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 3) {
                int sret;
 
                if (*write_lock_level < level + 1) {
@@ -2540,7 +2553,7 @@ setup_nodes_for_search(struct btrfs_trans_handle *trans,
                }
                b = p->nodes[level];
        } else if (ins_len < 0 && btrfs_header_nritems(b) <
-                  BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) / 2) {
+                  BTRFS_NODEPTRS_PER_BLOCK(fs_info) / 2) {
                int sret;
 
                if (*write_lock_level < level + 1) {
@@ -2659,6 +2672,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
                      *root, struct btrfs_key *key, struct btrfs_path *p, int
                      ins_len, int cow)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *b;
        int slot;
        int ret;
@@ -2714,12 +2728,12 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
                 * so we always do read locks
                 */
                if (p->need_commit_sem)
-                       down_read(&root->fs_info->commit_root_sem);
+                       down_read(&fs_info->commit_root_sem);
                b = root->commit_root;
                extent_buffer_get(b);
                level = btrfs_header_level(b);
                if (p->need_commit_sem)
-                       up_read(&root->fs_info->commit_root_sem);
+                       up_read(&fs_info->commit_root_sem);
                if (!p->skip_locking)
                        btrfs_tree_read_lock(b);
        } else {
@@ -2942,6 +2956,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
 int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,
                          struct btrfs_path *p, u64 time_seq)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *b;
        int slot;
        int ret;
@@ -3016,7 +3031,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,
                                btrfs_clear_path_blocking(p, b,
                                                          BTRFS_READ_LOCK);
                        }
-                       b = tree_mod_log_rewind(root->fs_info, p, b, time_seq);
+                       b = tree_mod_log_rewind(fs_info, p, b, time_seq);
                        if (!b) {
                                ret = -ENOMEM;
                                goto done;
@@ -3186,6 +3201,7 @@ static int push_node_left(struct btrfs_trans_handle *trans,
                          struct btrfs_root *root, struct extent_buffer *dst,
                          struct extent_buffer *src, int empty)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int push_items = 0;
        int src_nritems;
        int dst_nritems;
@@ -3193,7 +3209,7 @@ static int push_node_left(struct btrfs_trans_handle *trans,
 
        src_nritems = btrfs_header_nritems(src);
        dst_nritems = btrfs_header_nritems(dst);
-       push_items = BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - dst_nritems;
+       push_items = BTRFS_NODEPTRS_PER_BLOCK(fs_info) - dst_nritems;
        WARN_ON(btrfs_header_generation(src) != trans->transid);
        WARN_ON(btrfs_header_generation(dst) != trans->transid);
 
@@ -3218,7 +3234,7 @@ static int push_node_left(struct btrfs_trans_handle *trans,
        } else
                push_items = min(src_nritems - 8, push_items);
 
-       ret = tree_mod_log_eb_copy(root->fs_info, dst, src, dst_nritems, 0,
+       ret = tree_mod_log_eb_copy(fs_info, dst, src, dst_nritems, 0,
                                   push_items);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
@@ -3261,6 +3277,7 @@ static int balance_node_right(struct btrfs_trans_handle *trans,
                              struct extent_buffer *dst,
                              struct extent_buffer *src)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int push_items = 0;
        int max_push;
        int src_nritems;
@@ -3272,7 +3289,7 @@ static int balance_node_right(struct btrfs_trans_handle *trans,
 
        src_nritems = btrfs_header_nritems(src);
        dst_nritems = btrfs_header_nritems(dst);
-       push_items = BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - dst_nritems;
+       push_items = BTRFS_NODEPTRS_PER_BLOCK(fs_info) - dst_nritems;
        if (push_items <= 0)
                return 1;
 
@@ -3287,13 +3304,13 @@ static int balance_node_right(struct btrfs_trans_handle *trans,
        if (max_push < push_items)
                push_items = max_push;
 
-       tree_mod_log_eb_move(root->fs_info, dst, push_items, 0, dst_nritems);
+       tree_mod_log_eb_move(fs_info, dst, push_items, 0, dst_nritems);
        memmove_extent_buffer(dst, btrfs_node_key_ptr_offset(push_items),
                                      btrfs_node_key_ptr_offset(0),
                                      (dst_nritems) *
                                      sizeof(struct btrfs_key_ptr));
 
-       ret = tree_mod_log_eb_copy(root->fs_info, dst, src, 0,
+       ret = tree_mod_log_eb_copy(fs_info, dst, src, 0,
                                   src_nritems - push_items, push_items);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
@@ -3324,6 +3341,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
                           struct btrfs_path *path, int level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 lower_gen;
        struct extent_buffer *lower;
        struct extent_buffer *c;
@@ -3344,7 +3362,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
        if (IS_ERR(c))
                return PTR_ERR(c);
 
-       root_add_used(root, root->fs_info->nodesize);
+       root_add_used(root, fs_info->nodesize);
 
        memzero_extent_buffer(c, 0, sizeof(struct btrfs_header));
        btrfs_set_header_nritems(c, 1);
@@ -3354,8 +3372,8 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
        btrfs_set_header_backref_rev(c, BTRFS_MIXED_BACKREF_REV);
        btrfs_set_header_owner(c, root->root_key.objectid);
 
-       write_extent_buffer_fsid(c, root->fs_info->fsid);
-       write_extent_buffer_chunk_tree_uuid(c, root->fs_info->chunk_tree_uuid);
+       write_extent_buffer_fsid(c, fs_info->fsid);
+       write_extent_buffer_chunk_tree_uuid(c, fs_info->chunk_tree_uuid);
 
        btrfs_set_node_key(c, &lower_key, 0);
        btrfs_set_node_blockptr(c, 0, lower->start);
@@ -3393,6 +3411,7 @@ static void insert_ptr(struct btrfs_trans_handle *trans,
                       struct btrfs_disk_key *key, u64 bytenr,
                       int slot, int level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *lower;
        int nritems;
        int ret;
@@ -3402,10 +3421,10 @@ static void insert_ptr(struct btrfs_trans_handle *trans,
        lower = path->nodes[level];
        nritems = btrfs_header_nritems(lower);
        BUG_ON(slot > nritems);
-       BUG_ON(nritems == BTRFS_NODEPTRS_PER_BLOCK(root->fs_info));
+       BUG_ON(nritems == BTRFS_NODEPTRS_PER_BLOCK(fs_info));
        if (slot != nritems) {
                if (level)
-                       tree_mod_log_eb_move(root->fs_info, lower, slot + 1,
+                       tree_mod_log_eb_move(fs_info, lower, slot + 1,
                                             slot, nritems - slot);
                memmove_extent_buffer(lower,
                              btrfs_node_key_ptr_offset(slot + 1),
@@ -3413,7 +3432,7 @@ static void insert_ptr(struct btrfs_trans_handle *trans,
                              (nritems - slot) * sizeof(struct btrfs_key_ptr));
        }
        if (level) {
-               ret = tree_mod_log_insert_key(root->fs_info, lower, slot,
+               ret = tree_mod_log_insert_key(fs_info, lower, slot,
                                              MOD_LOG_KEY_ADD, GFP_NOFS);
                BUG_ON(ret < 0);
        }
@@ -3438,6 +3457,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root,
                               struct btrfs_path *path, int level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *c;
        struct extent_buffer *split;
        struct btrfs_disk_key disk_key;
@@ -3465,7 +3485,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
                ret = push_nodes_for_insert(trans, root, path, level);
                c = path->nodes[level];
                if (!ret && btrfs_header_nritems(c) <
-                   BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - 3)
+                   BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 3)
                        return 0;
                if (ret < 0)
                        return ret;
@@ -3480,7 +3500,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
        if (IS_ERR(split))
                return PTR_ERR(split);
 
-       root_add_used(root, root->fs_info->nodesize);
+       root_add_used(root, fs_info->nodesize);
 
        memzero_extent_buffer(split, 0, sizeof(struct btrfs_header));
        btrfs_set_header_level(split, btrfs_header_level(c));
@@ -3488,12 +3508,10 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
        btrfs_set_header_generation(split, trans->transid);
        btrfs_set_header_backref_rev(split, BTRFS_MIXED_BACKREF_REV);
        btrfs_set_header_owner(split, root->root_key.objectid);
-       write_extent_buffer_fsid(split, root->fs_info->fsid);
-       write_extent_buffer_chunk_tree_uuid(split,
-                       root->fs_info->chunk_tree_uuid);
+       write_extent_buffer_fsid(split, fs_info->fsid);
+       write_extent_buffer_chunk_tree_uuid(split, fs_info->chunk_tree_uuid);
 
-       ret = tree_mod_log_eb_copy(root->fs_info, split, c, 0,
-                                  mid, c_nritems - mid);
+       ret = tree_mod_log_eb_copy(fs_info, split, c, 0, mid, c_nritems - mid);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                return ret;
@@ -3560,15 +3578,17 @@ static int leaf_space_used(struct extent_buffer *l, int start, int nr)
 noinline int btrfs_leaf_free_space(struct btrfs_root *root,
                                   struct extent_buffer *leaf)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int nritems = btrfs_header_nritems(leaf);
        int ret;
-       ret = BTRFS_LEAF_DATA_SIZE(root->fs_info) - leaf_space_used(leaf, 0, nritems);
+
+       ret = BTRFS_LEAF_DATA_SIZE(fs_info) - leaf_space_used(leaf, 0, nritems);
        if (ret < 0) {
-               btrfs_crit(root->fs_info,
-                       "leaf free space ret %d, leaf data size %lu, used %d nritems %d",
-                      ret,
-                      (unsigned long) BTRFS_LEAF_DATA_SIZE(root->fs_info),
-                      leaf_space_used(leaf, 0, nritems), nritems);
+               btrfs_crit(fs_info,
+                          "leaf free space ret %d, leaf data size %lu, used %d nritems %d",
+                          ret,
+                          (unsigned long) BTRFS_LEAF_DATA_SIZE(fs_info),
+                          leaf_space_used(leaf, 0, nritems), nritems);
        }
        return ret;
 }
@@ -3585,6 +3605,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
                                      int free_space, u32 left_nritems,
                                      u32 min_slot)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *left = path->nodes[0];
        struct extent_buffer *upper = path->nodes[1];
        struct btrfs_map_token token;
@@ -3654,11 +3675,11 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
        memmove_extent_buffer(right,
                              btrfs_leaf_data(right) + data_end - push_space,
                              btrfs_leaf_data(right) + data_end,
-                             BTRFS_LEAF_DATA_SIZE(root->fs_info) - data_end);
+                             BTRFS_LEAF_DATA_SIZE(fs_info) - data_end);
 
        /* copy from the left data area */
        copy_extent_buffer(right, left, btrfs_leaf_data(right) +
-                    BTRFS_LEAF_DATA_SIZE(root->fs_info) - push_space,
+                    BTRFS_LEAF_DATA_SIZE(fs_info) - push_space,
                     btrfs_leaf_data(left) + leaf_data_end(root, left),
                     push_space);
 
@@ -3674,7 +3695,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
        /* update the item pointers */
        right_nritems += push_items;
        btrfs_set_header_nritems(right, right_nritems);
-       push_space = BTRFS_LEAF_DATA_SIZE(root->fs_info);
+       push_space = BTRFS_LEAF_DATA_SIZE(fs_info);
        for (i = 0; i < right_nritems; i++) {
                item = btrfs_item_nr(i);
                push_space -= btrfs_token_item_size(right, item, &token);
@@ -3687,7 +3708,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
        if (left_nritems)
                btrfs_mark_buffer_dirty(left);
        else
-               clean_tree_block(trans, root->fs_info, left);
+               clean_tree_block(trans, fs_info, left);
 
        btrfs_mark_buffer_dirty(right);
 
@@ -3699,7 +3720,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
        if (path->slots[0] >= left_nritems) {
                path->slots[0] -= left_nritems;
                if (btrfs_header_nritems(path->nodes[0]) == 0)
-                       clean_tree_block(trans, root->fs_info, path->nodes[0]);
+                       clean_tree_block(trans, fs_info, path->nodes[0]);
                btrfs_tree_unlock(path->nodes[0]);
                free_extent_buffer(path->nodes[0]);
                path->nodes[0] = right;
@@ -3814,6 +3835,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
                                     int free_space, u32 right_nritems,
                                     u32 max_slot)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_disk_key disk_key;
        struct extent_buffer *right = path->nodes[0];
        int i;
@@ -3870,7 +3892,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
                           btrfs_item_nr_offset(0),
                           push_items * sizeof(struct btrfs_item));
 
-       push_space = BTRFS_LEAF_DATA_SIZE(root->fs_info) -
+       push_space = BTRFS_LEAF_DATA_SIZE(fs_info) -
                     btrfs_item_offset_nr(right, push_items - 1);
 
        copy_extent_buffer(left, right, btrfs_leaf_data(left) +
@@ -3889,7 +3911,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
 
                ioff = btrfs_token_item_offset(left, item, &token);
                btrfs_set_token_item_offset(left, item,
-                     ioff - (BTRFS_LEAF_DATA_SIZE(root->fs_info) - old_left_item_size),
+                     ioff - (BTRFS_LEAF_DATA_SIZE(fs_info) - old_left_item_size),
                      &token);
        }
        btrfs_set_header_nritems(left, old_left_nritems + push_items);
@@ -3903,7 +3925,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
                push_space = btrfs_item_offset_nr(right, push_items - 1) -
                                                  leaf_data_end(root, right);
                memmove_extent_buffer(right, btrfs_leaf_data(right) +
-                                     BTRFS_LEAF_DATA_SIZE(root->fs_info) - push_space,
+                                     BTRFS_LEAF_DATA_SIZE(fs_info) - push_space,
                                      btrfs_leaf_data(right) +
                                      leaf_data_end(root, right), push_space);
 
@@ -3914,7 +3936,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
        }
        right_nritems -= push_items;
        btrfs_set_header_nritems(right, right_nritems);
-       push_space = BTRFS_LEAF_DATA_SIZE(root->fs_info);
+       push_space = BTRFS_LEAF_DATA_SIZE(fs_info);
        for (i = 0; i < right_nritems; i++) {
                item = btrfs_item_nr(i);
 
@@ -3927,10 +3949,10 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
        if (right_nritems)
                btrfs_mark_buffer_dirty(right);
        else
-               clean_tree_block(trans, root->fs_info, right);
+               clean_tree_block(trans, fs_info, right);
 
        btrfs_item_key(right, &disk_key, 0);
-       fixup_low_keys(root->fs_info, path, &disk_key, 1);
+       fixup_low_keys(fs_info, path, &disk_key, 1);
 
        /* then fixup the leaf pointer in the path */
        if (path->slots[0] < push_items) {
@@ -4036,6 +4058,7 @@ static noinline void copy_for_split(struct btrfs_trans_handle *trans,
                                    struct extent_buffer *right,
                                    int slot, int mid, int nritems)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int data_copy_size;
        int rt_data_off;
        int i;
@@ -4053,12 +4076,11 @@ static noinline void copy_for_split(struct btrfs_trans_handle *trans,
                           nritems * sizeof(struct btrfs_item));
 
        copy_extent_buffer(right, l,
-                    btrfs_leaf_data(right) + BTRFS_LEAF_DATA_SIZE(root->fs_info) -
+                    btrfs_leaf_data(right) + BTRFS_LEAF_DATA_SIZE(fs_info) -
                     data_copy_size, btrfs_leaf_data(l) +
                     leaf_data_end(root, l), data_copy_size);
 
-       rt_data_off = BTRFS_LEAF_DATA_SIZE(root->fs_info) -
-                     btrfs_item_end_nr(l, mid);
+       rt_data_off = BTRFS_LEAF_DATA_SIZE(fs_info) - btrfs_item_end_nr(l, mid);
 
        for (i = 0; i < nritems; i++) {
                struct btrfs_item *item = btrfs_item_nr(i);
@@ -4181,7 +4203,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
        l = path->nodes[0];
        slot = path->slots[0];
        if (extend && data_size + btrfs_item_size_nr(l, slot) +
-           sizeof(struct btrfs_item) > BTRFS_LEAF_DATA_SIZE(root->fs_info))
+           sizeof(struct btrfs_item) > BTRFS_LEAF_DATA_SIZE(fs_info))
                return -EOVERFLOW;
 
        /* first try to make some room by pushing left and right */
@@ -4223,14 +4245,14 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
        if (mid <= slot) {
                if (nritems == 1 ||
                    leaf_space_used(l, mid, nritems - mid) + data_size >
-                       BTRFS_LEAF_DATA_SIZE(root->fs_info)) {
+                       BTRFS_LEAF_DATA_SIZE(fs_info)) {
                        if (slot >= nritems) {
                                split = 0;
                        } else {
                                mid = slot;
                                if (mid != nritems &&
                                    leaf_space_used(l, mid, nritems - mid) +
-                                   data_size > BTRFS_LEAF_DATA_SIZE(root->fs_info)) {
+                                   data_size > BTRFS_LEAF_DATA_SIZE(fs_info)) {
                                        if (data_size && !tried_avoid_double)
                                                goto push_for_double;
                                        split = 2;
@@ -4239,7 +4261,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
                }
        } else {
                if (leaf_space_used(l, 0, mid) + data_size >
-                       BTRFS_LEAF_DATA_SIZE(root->fs_info)) {
+                       BTRFS_LEAF_DATA_SIZE(fs_info)) {
                        if (!extend && data_size && slot == 0) {
                                split = 0;
                        } else if ((extend || !data_size) && slot == 0) {
@@ -4248,7 +4270,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
                                mid = slot;
                                if (mid != nritems &&
                                    leaf_space_used(l, mid, nritems - mid) +
-                                   data_size > BTRFS_LEAF_DATA_SIZE(root->fs_info)) {
+                                   data_size > BTRFS_LEAF_DATA_SIZE(fs_info)) {
                                        if (data_size && !tried_avoid_double)
                                                goto push_for_double;
                                        split = 2;
@@ -4267,7 +4289,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
        if (IS_ERR(right))
                return PTR_ERR(right);
 
-       root_add_used(root, root->fs_info->nodesize);
+       root_add_used(root, fs_info->nodesize);
 
        memzero_extent_buffer(right, 0, sizeof(struct btrfs_header));
        btrfs_set_header_bytenr(right, right->start);
@@ -4539,6 +4561,7 @@ int btrfs_duplicate_item(struct btrfs_trans_handle *trans,
 void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
                         u32 new_size, int from_end)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int slot;
        struct extent_buffer *leaf;
        struct btrfs_item *item;
@@ -4619,7 +4642,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
                btrfs_set_disk_key_offset(&disk_key, offset + size_diff);
                btrfs_set_item_key(leaf, &disk_key, slot);
                if (slot == 0)
-                       fixup_low_keys(root->fs_info, path, &disk_key, 1);
+                       fixup_low_keys(fs_info, path, &disk_key, 1);
        }
 
        item = btrfs_item_nr(slot);
@@ -4638,6 +4661,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
 void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,
                       u32 data_size)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int slot;
        struct extent_buffer *leaf;
        struct btrfs_item *item;
@@ -4665,8 +4689,8 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,
        BUG_ON(slot < 0);
        if (slot >= nritems) {
                btrfs_print_leaf(root, leaf);
-               btrfs_crit(root->fs_info, "slot %d too large, nritems %d",
-                      slot, nritems);
+               btrfs_crit(fs_info, "slot %d too large, nritems %d",
+                          slot, nritems);
                BUG_ON(1);
        }
 
@@ -4709,6 +4733,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
                            struct btrfs_key *cpu_key, u32 *data_size,
                            u32 total_data, u32 total_size, int nr)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_item *item;
        int i;
        u32 nritems;
@@ -4720,7 +4745,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
 
        if (path->slots[0] == 0) {
                btrfs_cpu_key_to_disk(&disk_key, cpu_key);
-               fixup_low_keys(root->fs_info, path, &disk_key, 1);
+               fixup_low_keys(fs_info, path, &disk_key, 1);
        }
        btrfs_unlock_up_safe(path, 1);
 
@@ -4734,8 +4759,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
 
        if (btrfs_leaf_free_space(root, leaf) < total_size) {
                btrfs_print_leaf(root, leaf);
-               btrfs_crit(root->fs_info,
-                          "not enough freespace need %u have %d",
+               btrfs_crit(fs_info, "not enough freespace need %u have %d",
                           total_size, btrfs_leaf_free_space(root, leaf));
                BUG();
        }
@@ -4745,8 +4769,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
 
                if (old_data < data_end) {
                        btrfs_print_leaf(root, leaf);
-                       btrfs_crit(root->fs_info,
-                                  "slot %d old_data %d data_end %d",
+                       btrfs_crit(fs_info, "slot %d old_data %d data_end %d",
                                   slot, old_data, data_end);
                        BUG_ON(1);
                }
@@ -4864,6 +4887,7 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root
 static void del_ptr(struct btrfs_root *root, struct btrfs_path *path,
                    int level, int slot)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *parent = path->nodes[level];
        u32 nritems;
        int ret;
@@ -4871,7 +4895,7 @@ static void del_ptr(struct btrfs_root *root, struct btrfs_path *path,
        nritems = btrfs_header_nritems(parent);
        if (slot != nritems - 1) {
                if (level)
-                       tree_mod_log_eb_move(root->fs_info, parent, slot,
+                       tree_mod_log_eb_move(fs_info, parent, slot,
                                             slot + 1, nritems - slot - 1);
                memmove_extent_buffer(parent,
                              btrfs_node_key_ptr_offset(slot),
@@ -4879,7 +4903,7 @@ static void del_ptr(struct btrfs_root *root, struct btrfs_path *path,
                              sizeof(struct btrfs_key_ptr) *
                              (nritems - slot - 1));
        } else if (level) {
-               ret = tree_mod_log_insert_key(root->fs_info, parent, slot,
+               ret = tree_mod_log_insert_key(fs_info, parent, slot,
                                              MOD_LOG_KEY_REMOVE, GFP_NOFS);
                BUG_ON(ret < 0);
        }
@@ -4894,7 +4918,7 @@ static void del_ptr(struct btrfs_root *root, struct btrfs_path *path,
                struct btrfs_disk_key disk_key;
 
                btrfs_node_key(parent, &disk_key, 0);
-               fixup_low_keys(root->fs_info, path, &disk_key, level + 1);
+               fixup_low_keys(fs_info, path, &disk_key, level + 1);
        }
        btrfs_mark_buffer_dirty(parent);
 }
@@ -4936,6 +4960,7 @@ static noinline void btrfs_del_leaf(struct btrfs_trans_handle *trans,
 int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                    struct btrfs_path *path, int slot, int nr)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *leaf;
        struct btrfs_item *item;
        u32 last_off;
@@ -4987,7 +5012,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                        btrfs_set_header_level(leaf, 0);
                } else {
                        btrfs_set_path_blocking(path);
-                       clean_tree_block(trans, root->fs_info, leaf);
+                       clean_tree_block(trans, fs_info, leaf);
                        btrfs_del_leaf(trans, root, path, leaf);
                }
        } else {
@@ -4996,11 +5021,11 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                        struct btrfs_disk_key disk_key;
 
                        btrfs_item_key(leaf, &disk_key, 0);
-                       fixup_low_keys(root->fs_info, path, &disk_key, 1);
+                       fixup_low_keys(fs_info, path, &disk_key, 1);
                }
 
                /* delete the leaf if it is mostly empty */
-               if (used < BTRFS_LEAF_DATA_SIZE(root->fs_info) / 3) {
+               if (used < BTRFS_LEAF_DATA_SIZE(fs_info) / 3) {
                        /* push_leaf_left fixes the path.
                         * make sure the path still points to our leaf
                         * for possible call to del_ptr below
@@ -5337,6 +5362,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
                        struct btrfs_root *right_root,
                        btrfs_changed_cb_t changed_cb, void *ctx)
 {
+       struct btrfs_fs_info *fs_info = left_root->fs_info;
        int ret;
        int cmp;
        struct btrfs_path *left_path = NULL;
@@ -5368,10 +5394,9 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
                goto out;
        }
 
-       tmp_buf = kmalloc(left_root->fs_info->nodesize,
-                         GFP_KERNEL | __GFP_NOWARN);
+       tmp_buf = kmalloc(fs_info->nodesize, GFP_KERNEL | __GFP_NOWARN);
        if (!tmp_buf) {
-               tmp_buf = vmalloc(left_root->fs_info->nodesize);
+               tmp_buf = vmalloc(fs_info->nodesize);
                if (!tmp_buf) {
                        ret = -ENOMEM;
                        goto out;
@@ -5419,7 +5444,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
         *   the right if possible or go up and right.
         */
 
-       down_read(&left_root->fs_info->commit_root_sem);
+       down_read(&fs_info->commit_root_sem);
        left_level = btrfs_header_level(left_root->commit_root);
        left_root_level = left_level;
        left_path->nodes[left_level] = left_root->commit_root;
@@ -5429,7 +5454,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
        right_root_level = right_level;
        right_path->nodes[right_level] = right_root->commit_root;
        extent_buffer_get(right_path->nodes[right_level]);
-       up_read(&left_root->fs_info->commit_root_sem);
+       up_read(&fs_info->commit_root_sem);
 
        if (left_level == 0)
                btrfs_item_key_to_cpu(left_path->nodes[left_level],
index 19b6bb2f2368ae1c7507e3f74f52bd7d87711122..860103020ac9ecdaeb41f2afc97327520dc34c14 100644 (file)
@@ -1352,9 +1352,11 @@ static inline int
 btrfs_should_fragment_free_space(struct btrfs_root *root,
                                 struct btrfs_block_group_cache *block_group)
 {
-       return (btrfs_test_opt(root->fs_info, FRAGMENT_METADATA) &&
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       return (btrfs_test_opt(fs_info, FRAGMENT_METADATA) &&
                block_group->flags & BTRFS_BLOCK_GROUP_METADATA) ||
-              (btrfs_test_opt(root->fs_info, FRAGMENT_DATA) &&
+              (btrfs_test_opt(fs_info, FRAGMENT_DATA) &&
                block_group->flags &  BTRFS_BLOCK_GROUP_DATA);
 }
 #endif
@@ -2312,10 +2314,11 @@ static inline unsigned long btrfs_leaf_data(struct extent_buffer *l)
 static inline unsigned int leaf_data_end(struct btrfs_root *root,
                                         struct extent_buffer *leaf)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u32 nr = btrfs_header_nritems(leaf);
 
        if (nr == 0)
-               return BTRFS_LEAF_DATA_SIZE(root->fs_info);
+               return BTRFS_LEAF_DATA_SIZE(fs_info);
        return btrfs_item_offset_nr(leaf, nr - 1);
 }
 
@@ -2905,8 +2908,9 @@ static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)
  */
 static inline int btrfs_need_cleaner_sleep(struct btrfs_root *root)
 {
-       return (root->fs_info->sb->s_flags & MS_RDONLY ||
-               btrfs_fs_closing(root->fs_info));
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       return (fs_info->sb->s_flags & MS_RDONLY || btrfs_fs_closing(fs_info));
 }
 
 static inline void free_fs_info(struct btrfs_fs_info *fs_info)
index d4e07816fee0ea167b2a4575be0158f500520a6f..d7d5eb989f7d2fabcea1fb121ace0ecb86041b07 100644 (file)
@@ -538,6 +538,7 @@ static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans,
                                               struct btrfs_root *root,
                                               struct btrfs_delayed_item *item)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *src_rsv;
        struct btrfs_block_rsv *dst_rsv;
        u64 num_bytes;
@@ -547,12 +548,12 @@ static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans,
                return 0;
 
        src_rsv = trans->block_rsv;
-       dst_rsv = &root->fs_info->delayed_block_rsv;
+       dst_rsv = &fs_info->delayed_block_rsv;
 
-       num_bytes = btrfs_calc_trans_metadata_size(root->fs_info, 1);
+       num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
        ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);
        if (!ret) {
-               trace_btrfs_space_reservation(root->fs_info, "delayed_item",
+               trace_btrfs_space_reservation(fs_info, "delayed_item",
                                              item->key.objectid,
                                              num_bytes, 1);
                item->bytes_reserved = num_bytes;
@@ -564,13 +565,14 @@ static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans,
 static void btrfs_delayed_item_release_metadata(struct btrfs_root *root,
                                                struct btrfs_delayed_item *item)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *rsv;
 
        if (!item->bytes_reserved)
                return;
 
-       rsv = &root->fs_info->delayed_block_rsv;
-       trace_btrfs_space_reservation(root->fs_info, "delayed_item",
+       rsv = &fs_info->delayed_block_rsv;
+       trace_btrfs_space_reservation(fs_info, "delayed_item",
                                      item->key.objectid, item->bytes_reserved,
                                      0);
        btrfs_block_rsv_release(root, rsv,
@@ -583,6 +585,7 @@ static int btrfs_delayed_inode_reserve_metadata(
                                        struct inode *inode,
                                        struct btrfs_delayed_node *node)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *src_rsv;
        struct btrfs_block_rsv *dst_rsv;
        u64 num_bytes;
@@ -590,9 +593,9 @@ static int btrfs_delayed_inode_reserve_metadata(
        bool release = false;
 
        src_rsv = trans->block_rsv;
-       dst_rsv = &root->fs_info->delayed_block_rsv;
+       dst_rsv = &fs_info->delayed_block_rsv;
 
-       num_bytes = btrfs_calc_trans_metadata_size(root->fs_info, 1);
+       num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
 
        /*
         * If our block_rsv is the delalloc block reserve then check and see if
@@ -640,7 +643,7 @@ static int btrfs_delayed_inode_reserve_metadata(
                        ret = -ENOSPC;
                if (!ret) {
                        node->bytes_reserved = num_bytes;
-                       trace_btrfs_space_reservation(root->fs_info,
+                       trace_btrfs_space_reservation(fs_info,
                                                      "delayed_inode",
                                                      btrfs_ino(inode),
                                                      num_bytes, 1);
@@ -664,13 +667,13 @@ static int btrfs_delayed_inode_reserve_metadata(
         * how block rsvs. work.
         */
        if (!ret) {
-               trace_btrfs_space_reservation(root->fs_info, "delayed_inode",
+               trace_btrfs_space_reservation(fs_info, "delayed_inode",
                                              btrfs_ino(inode), num_bytes, 1);
                node->bytes_reserved = num_bytes;
        }
 
        if (release) {
-               trace_btrfs_space_reservation(root->fs_info, "delalloc",
+               trace_btrfs_space_reservation(fs_info, "delalloc",
                                              btrfs_ino(inode), num_bytes, 0);
                btrfs_block_rsv_release(root, src_rsv, num_bytes);
        }
@@ -681,13 +684,14 @@ static int btrfs_delayed_inode_reserve_metadata(
 static void btrfs_delayed_inode_release_metadata(struct btrfs_root *root,
                                                struct btrfs_delayed_node *node)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *rsv;
 
        if (!node->bytes_reserved)
                return;
 
-       rsv = &root->fs_info->delayed_block_rsv;
-       trace_btrfs_space_reservation(root->fs_info, "delayed_inode",
+       rsv = &fs_info->delayed_block_rsv;
+       trace_btrfs_space_reservation(fs_info, "delayed_inode",
                                      node->inode_id, node->bytes_reserved, 0);
        btrfs_block_rsv_release(root, rsv,
                                node->bytes_reserved);
@@ -1140,6 +1144,7 @@ __btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
 static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans,
                                     struct btrfs_root *root, int nr)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_delayed_root *delayed_root;
        struct btrfs_delayed_node *curr_node, *prev_node;
        struct btrfs_path *path;
@@ -1156,7 +1161,7 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans,
        path->leave_spinning = 1;
 
        block_rsv = trans->block_rsv;
-       trans->block_rsv = &root->fs_info->delayed_block_rsv;
+       trans->block_rsv = &fs_info->delayed_block_rsv;
 
        delayed_root = btrfs_get_delayed_root(root);
 
@@ -1860,6 +1865,7 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,
 
 int btrfs_delayed_delete_inode_ref(struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_delayed_node *delayed_node;
 
        /*
@@ -1867,8 +1873,7 @@ int btrfs_delayed_delete_inode_ref(struct inode *inode)
         * leads to enospc problems.  This means we also can't do
         * delayed inode refs
         */
-       if (test_bit(BTRFS_FS_LOG_RECOVERING,
-                    &BTRFS_I(inode)->root->fs_info->flags))
+       if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags))
                return -EAGAIN;
 
        delayed_node = btrfs_get_or_create_delayed_node(inode);
@@ -1895,7 +1900,7 @@ int btrfs_delayed_delete_inode_ref(struct inode *inode)
 
        set_bit(BTRFS_DELAYED_NODE_DEL_IREF, &delayed_node->flags);
        delayed_node->count++;
-       atomic_inc(&BTRFS_I(inode)->root->fs_info->delayed_root->items);
+       atomic_inc(&fs_info->delayed_root->items);
 release_node:
        mutex_unlock(&delayed_node->mutex);
        btrfs_release_delayed_node(delayed_node);
index 05169ef305962d8be6b43e1e07a5935f9035b788..c6558ed933010a1b31533d0536dca4077dd8cceb 100644 (file)
@@ -142,7 +142,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
                 * 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 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
                           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 */
index 79233ab69ae5fc6a95177bfc089e0be776f0a43b..128f8ab20d419f036465d19c08f0f524644a35af 100644 (file)
@@ -451,12 +451,12 @@ int verify_dir_item(struct btrfs_root *root,
                    struct extent_buffer *leaf,
                    struct btrfs_dir_item *dir_item)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u16 namelen = BTRFS_NAME_LEN;
        u8 type = btrfs_dir_type(leaf, dir_item);
 
        if (type >= BTRFS_FT_MAX) {
-               btrfs_crit(root->fs_info, "invalid dir item type: %d",
-                      (int)type);
+               btrfs_crit(fs_info, "invalid dir item type: %d", (int)type);
                return 1;
        }
 
@@ -464,16 +464,16 @@ int verify_dir_item(struct btrfs_root *root,
                namelen = XATTR_NAME_MAX;
 
        if (btrfs_dir_name_len(leaf, dir_item) > namelen) {
-               btrfs_crit(root->fs_info, "invalid dir item name len: %u",
+               btrfs_crit(fs_info, "invalid dir item name len: %u",
                       (unsigned)btrfs_dir_data_len(leaf, dir_item));
                return 1;
        }
 
        /* BTRFS_MAX_XATTR_SIZE is the same for all dir items */
        if ((btrfs_dir_data_len(leaf, dir_item) +
-            btrfs_dir_name_len(leaf, dir_item)) > BTRFS_MAX_XATTR_SIZE(root->fs_info)) {
-               btrfs_crit(root->fs_info,
-                          "invalid dir item name + data len: %u + %u",
+            btrfs_dir_name_len(leaf, dir_item)) >
+                                       BTRFS_MAX_XATTR_SIZE(fs_info)) {
+               btrfs_crit(fs_info, "invalid dir item name + data len: %u + %u",
                           (unsigned)btrfs_dir_name_len(leaf, dir_item),
                           (unsigned)btrfs_dir_data_len(leaf, dir_item));
                return 1;
index 5abf3afa6ea5bb1555ba2444363e239b173b3a6e..02ba794d171e073d6b432d57efc70ca76cef3264 100644 (file)
@@ -224,6 +224,7 @@ static struct extent_map *btree_get_extent(struct inode *inode,
                struct page *page, size_t pg_offset, u64 start, u64 len,
                int create)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
        struct extent_map *em;
        int ret;
@@ -231,8 +232,7 @@ static struct extent_map *btree_get_extent(struct inode *inode,
        read_lock(&em_tree->lock);
        em = lookup_extent_mapping(em_tree, start, len);
        if (em) {
-               em->bdev =
-                       BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
+               em->bdev = fs_info->fs_devices->latest_bdev;
                read_unlock(&em_tree->lock);
                goto out;
        }
@@ -247,7 +247,7 @@ static struct extent_map *btree_get_extent(struct inode *inode,
        em->len = (u64)-1;
        em->block_len = (u64)-1;
        em->block_start = 0;
-       em->bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
+       em->bdev = fs_info->fs_devices->latest_bdev;
 
        write_lock(&em_tree->lock);
        ret = add_extent_mapping(em_tree, em, 0);
@@ -444,6 +444,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
                                          struct extent_buffer *eb,
                                          u64 parent_transid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_io_tree *io_tree;
        int failed = 0;
        int ret;
@@ -452,7 +453,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
        int failed_mirror = 0;
 
        clear_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags);
-       io_tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree;
+       io_tree = &BTRFS_I(fs_info->btree_inode)->io_tree;
        while (1) {
                ret = read_extent_buffer_pages(io_tree, eb, WAIT_COMPLETE,
                                               btree_get_extent, mirror_num);
@@ -472,7 +473,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
                if (test_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags))
                        break;
 
-               num_copies = btrfs_num_copies(root->fs_info,
+               num_copies = btrfs_num_copies(fs_info,
                                              eb->start, eb->len);
                if (num_copies == 1)
                        break;
@@ -545,15 +546,16 @@ static int check_tree_block_fsid(struct btrfs_fs_info *fs_info,
        return ret;
 }
 
-#define CORRUPT(reason, eb, root, slot)                                \
-       btrfs_crit(root->fs_info, "corrupt %s, %s: block=%llu," \
-                  " root=%llu, slot=%d",                       \
-                  btrfs_header_level(eb) == 0 ? "leaf" : "node",\
+#define CORRUPT(reason, eb, root, slot)                                        \
+       btrfs_crit(root->fs_info,                                       \
+                  "corrupt %s, %s: block=%llu, root=%llu, slot=%d",    \
+                  btrfs_header_level(eb) == 0 ? "leaf" : "node",       \
                   reason, btrfs_header_bytenr(eb), root->objectid, slot)
 
 static noinline int check_leaf(struct btrfs_root *root,
                               struct extent_buffer *leaf)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key key;
        struct btrfs_key leaf_key;
        u32 nritems = btrfs_header_nritems(leaf);
@@ -566,7 +568,7 @@ static noinline int check_leaf(struct btrfs_root *root,
                key.type = BTRFS_ROOT_ITEM_KEY;
                key.offset = (u64)-1;
 
-               check_root = btrfs_get_fs_root(root->fs_info, &key, false);
+               check_root = btrfs_get_fs_root(fs_info, &key, false);
                /*
                 * The only reason we also check NULL here is that during
                 * open_ctree() some roots has not yet been set up.
@@ -585,7 +587,7 @@ static noinline int check_leaf(struct btrfs_root *root,
 
        /* Check the 0 item */
        if (btrfs_item_offset_nr(leaf, 0) + btrfs_item_size_nr(leaf, 0) !=
-           BTRFS_LEAF_DATA_SIZE(root->fs_info)) {
+           BTRFS_LEAF_DATA_SIZE(fs_info)) {
                CORRUPT("invalid item offset size pair", leaf, root, 0);
                return -EIO;
        }
@@ -624,7 +626,7 @@ static noinline int check_leaf(struct btrfs_root *root,
                 * all point outside of the leaf.
                 */
                if (btrfs_item_end_nr(leaf, slot) >
-                   BTRFS_LEAF_DATA_SIZE(root->fs_info)) {
+                   BTRFS_LEAF_DATA_SIZE(fs_info)) {
                        CORRUPT("slot end outside of leaf", leaf, root, slot);
                        return -EIO;
                }
@@ -1004,6 +1006,7 @@ static int btree_submit_bio_hook(struct inode *inode, struct bio *bio,
                                 int mirror_num, unsigned long bio_flags,
                                 u64 bio_offset)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int async = check_async_write(inode, bio_flags);
        int ret;
 
@@ -1012,8 +1015,8 @@ static int btree_submit_bio_hook(struct inode *inode, struct bio *bio,
                 * called for a read, do the setup so that checksum validation
                 * can happen in the async kernel threads
                 */
-               ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info,
-                                         bio, BTRFS_WQ_ENDIO_METADATA);
+               ret = btrfs_bio_wq_end_io(fs_info, bio,
+                                         BTRFS_WQ_ENDIO_METADATA);
                if (ret)
                        goto out_w_error;
                ret = btrfs_map_bio(BTRFS_I(inode)->root, bio, mirror_num, 0);
@@ -1027,8 +1030,7 @@ static int btree_submit_bio_hook(struct inode *inode, struct bio *bio,
                 * kthread helpers are used to submit writes so that
                 * checksumming can happen in parallel across all CPUs
                 */
-               ret = btrfs_wq_submit_bio(BTRFS_I(inode)->root->fs_info,
-                                         inode, bio, mirror_num, 0,
+               ret = btrfs_wq_submit_bio(fs_info, inode, bio, mirror_num, 0,
                                          bio_offset,
                                          __btree_submit_bio_start,
                                          __btree_submit_bio_done);
@@ -1194,9 +1196,11 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,
 struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
                                                 u64 bytenr)
 {
-       if (btrfs_is_testing(root->fs_info))
-               return alloc_test_extent_buffer(root->fs_info, bytenr);
-       return alloc_extent_buffer(root->fs_info, bytenr);
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       if (btrfs_is_testing(fs_info))
+               return alloc_test_extent_buffer(fs_info, bytenr);
+       return alloc_extent_buffer(fs_info, bytenr);
 }
 
 
@@ -1493,7 +1497,7 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,
        btrfs_set_header_owner(leaf, BTRFS_TREE_LOG_OBJECTID);
        root->node = leaf;
 
-       write_extent_buffer_fsid(root->node, root->fs_info->fsid);
+       write_extent_buffer_fsid(root->node, fs_info->fsid);
        btrfs_mark_buffer_dirty(root->node);
        btrfs_tree_unlock(root->node);
        return root;
@@ -1515,10 +1519,11 @@ int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans,
 int btrfs_add_log_tree(struct btrfs_trans_handle *trans,
                       struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *log_root;
        struct btrfs_inode_item *inode_item;
 
-       log_root = alloc_log_tree(trans, root->fs_info);
+       log_root = alloc_log_tree(trans, fs_info);
        if (IS_ERR(log_root))
                return PTR_ERR(log_root);
 
@@ -1530,7 +1535,7 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans,
        btrfs_set_stack_inode_size(inode_item, 3);
        btrfs_set_stack_inode_nlink(inode_item, 1);
        btrfs_set_stack_inode_nbytes(inode_item,
-                                    root->fs_info->nodesize);
+                                    fs_info->nodesize);
        btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
 
        btrfs_set_root_node(&log_root->root_item, log_root->node);
@@ -1828,6 +1833,7 @@ static void end_workqueue_fn(struct btrfs_work *work)
 static int cleaner_kthread(void *arg)
 {
        struct btrfs_root *root = arg;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int again;
        struct btrfs_trans_handle *trans;
 
@@ -1842,10 +1848,10 @@ static int cleaner_kthread(void *arg)
                 * Do not do anything if we might cause open_ctree() to block
                 * before we have finished mounting the filesystem.
                 */
-               if (!test_bit(BTRFS_FS_OPEN, &root->fs_info->flags))
+               if (!test_bit(BTRFS_FS_OPEN, &fs_info->flags))
                        goto sleep;
 
-               if (!mutex_trylock(&root->fs_info->cleaner_mutex))
+               if (!mutex_trylock(&fs_info->cleaner_mutex))
                        goto sleep;
 
                /*
@@ -1853,22 +1859,22 @@ static int cleaner_kthread(void *arg)
                 * during the above check and trylock.
                 */
                if (btrfs_need_cleaner_sleep(root)) {
-                       mutex_unlock(&root->fs_info->cleaner_mutex);
+                       mutex_unlock(&fs_info->cleaner_mutex);
                        goto sleep;
                }
 
-               mutex_lock(&root->fs_info->cleaner_delayed_iput_mutex);
+               mutex_lock(&fs_info->cleaner_delayed_iput_mutex);
                btrfs_run_delayed_iputs(root);
-               mutex_unlock(&root->fs_info->cleaner_delayed_iput_mutex);
+               mutex_unlock(&fs_info->cleaner_delayed_iput_mutex);
 
                again = btrfs_clean_one_deleted_snapshot(root);
-               mutex_unlock(&root->fs_info->cleaner_mutex);
+               mutex_unlock(&fs_info->cleaner_mutex);
 
                /*
                 * The defragger has dealt with the R/O remount and umount,
                 * needn't do anything special here.
                 */
-               btrfs_run_defrag_inodes(root->fs_info);
+               btrfs_run_defrag_inodes(fs_info);
 
                /*
                 * Acquires fs_info->delete_unused_bgs_mutex to avoid racing
@@ -1878,7 +1884,7 @@ static int cleaner_kthread(void *arg)
                 * can't hold, nor need to, fs_info->cleaner_mutex when deleting
                 * unused block groups.
                 */
-               btrfs_delete_unused_bgs(root->fs_info);
+               btrfs_delete_unused_bgs(fs_info);
 sleep:
                if (!again) {
                        set_current_state(TASK_INTERRUPTIBLE);
@@ -1902,7 +1908,7 @@ static int cleaner_kthread(void *arg)
        trans = btrfs_attach_transaction(root);
        if (IS_ERR(trans)) {
                if (PTR_ERR(trans) != -ENOENT)
-                       btrfs_err(root->fs_info,
+                       btrfs_err(fs_info,
                                  "cleaner transaction attach returned %ld",
                                  PTR_ERR(trans));
        } else {
@@ -1910,7 +1916,7 @@ static int cleaner_kthread(void *arg)
 
                ret = btrfs_commit_transaction(trans, root);
                if (ret)
-                       btrfs_err(root->fs_info,
+                       btrfs_err(fs_info,
                                  "cleaner open transaction commit returned %d",
                                  ret);
        }
@@ -1921,6 +1927,7 @@ static int cleaner_kthread(void *arg)
 static int transaction_kthread(void *arg)
 {
        struct btrfs_root *root = arg;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_trans_handle *trans;
        struct btrfs_transaction *cur;
        u64 transid;
@@ -1930,26 +1937,26 @@ static int transaction_kthread(void *arg)
 
        do {
                cannot_commit = false;
-               delay = HZ * root->fs_info->commit_interval;
-               mutex_lock(&root->fs_info->transaction_kthread_mutex);
+               delay = HZ * fs_info->commit_interval;
+               mutex_lock(&fs_info->transaction_kthread_mutex);
 
-               spin_lock(&root->fs_info->trans_lock);
-               cur = root->fs_info->running_transaction;
+               spin_lock(&fs_info->trans_lock);
+               cur = fs_info->running_transaction;
                if (!cur) {
-                       spin_unlock(&root->fs_info->trans_lock);
+                       spin_unlock(&fs_info->trans_lock);
                        goto sleep;
                }
 
                now = get_seconds();
                if (cur->state < TRANS_STATE_BLOCKED &&
                    (now < cur->start_time ||
-                    now - cur->start_time < root->fs_info->commit_interval)) {
-                       spin_unlock(&root->fs_info->trans_lock);
+                    now - cur->start_time < fs_info->commit_interval)) {
+                       spin_unlock(&fs_info->trans_lock);
                        delay = HZ * 5;
                        goto sleep;
                }
                transid = cur->transid;
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
 
                /* If the file system is aborted, this will always fail. */
                trans = btrfs_attach_transaction(root);
@@ -1964,15 +1971,15 @@ static int transaction_kthread(void *arg)
                        btrfs_end_transaction(trans, root);
                }
 sleep:
-               wake_up_process(root->fs_info->cleaner_kthread);
-               mutex_unlock(&root->fs_info->transaction_kthread_mutex);
+               wake_up_process(fs_info->cleaner_kthread);
+               mutex_unlock(&fs_info->transaction_kthread_mutex);
 
                if (unlikely(test_bit(BTRFS_FS_STATE_ERROR,
-                                     &root->fs_info->fs_state)))
+                                     &fs_info->fs_state)))
                        btrfs_cleanup_transaction(root);
                set_current_state(TASK_INTERRUPTIBLE);
                if (!kthread_should_stop() &&
-                               (!btrfs_transaction_blocked(root->fs_info) ||
+                               (!btrfs_transaction_blocked(fs_info) ||
                                 cannot_commit))
                        schedule_timeout(delay);
                __set_current_state(TASK_RUNNING);
@@ -2464,8 +2471,8 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
        /* returns with log_tree_root freed on success */
        ret = btrfs_recover_log_trees(log_tree_root);
        if (ret) {
-               btrfs_handle_fs_error(tree_root->fs_info, ret,
-                           "Failed to recover log tree");
+               btrfs_handle_fs_error(fs_info, ret,
+                                     "Failed to recover log tree");
                free_extent_buffer(log_tree_root->node);
                kfree(log_tree_root);
                return ret;
@@ -2830,7 +2837,7 @@ int open_ctree(struct super_block *sb,
 
        features = btrfs_super_incompat_flags(disk_super);
        features |= BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF;
-       if (tree_root->fs_info->compress_type == BTRFS_COMPRESS_LZO)
+       if (fs_info->compress_type == BTRFS_COMPRESS_LZO)
                features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO;
 
        if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)
@@ -3059,8 +3066,8 @@ int open_ctree(struct super_block *sb,
        if (IS_ERR(fs_info->transaction_kthread))
                goto fail_cleaner;
 
-       if (!btrfs_test_opt(tree_root->fs_info, SSD) &&
-           !btrfs_test_opt(tree_root->fs_info, NOSSD) &&
+       if (!btrfs_test_opt(fs_info, SSD) &&
+           !btrfs_test_opt(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);
@@ -3073,9 +3080,9 @@ int open_ctree(struct super_block *sb,
        btrfs_apply_pending_changes(fs_info);
 
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
-       if (btrfs_test_opt(tree_root->fs_info, CHECK_INTEGRITY)) {
+       if (btrfs_test_opt(fs_info, CHECK_INTEGRITY)) {
                ret = btrfsic_mount(tree_root, fs_devices,
-                                   btrfs_test_opt(tree_root->fs_info,
+                                   btrfs_test_opt(fs_info,
                                        CHECK_INTEGRITY_INCLUDING_EXTENT_DATA) ?
                                    1 : 0,
                                    fs_info->check_integrity_print_mask);
@@ -3091,7 +3098,7 @@ int open_ctree(struct super_block *sb,
 
        /* 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->fs_info, NOLOGREPLAY)) {
+           !btrfs_test_opt(fs_info, NOLOGREPLAY)) {
                ret = btrfs_replay_log(fs_info, fs_devices);
                if (ret) {
                        err = ret;
@@ -3152,7 +3159,7 @@ int open_ctree(struct super_block *sb,
                }
        }
 
-       if (btrfs_test_opt(tree_root->fs_info, FREE_SPACE_TREE) &&
+       if (btrfs_test_opt(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);
@@ -3198,7 +3205,7 @@ int open_ctree(struct super_block *sb,
                        close_ctree(fs_info);
                        return ret;
                }
-       } else if (btrfs_test_opt(tree_root->fs_info, RESCAN_UUID_TREE) ||
+       } else if (btrfs_test_opt(fs_info, RESCAN_UUID_TREE) ||
                   fs_info->generation !=
                                btrfs_super_uuid_tree_generation(disk_super)) {
                btrfs_info(fs_info, "checking UUID tree");
@@ -3274,7 +3281,7 @@ int open_ctree(struct super_block *sb,
        return err;
 
 recovery_tree_root:
-       if (!btrfs_test_opt(tree_root->fs_info, USEBACKUPROOT))
+       if (!btrfs_test_opt(fs_info, USEBACKUPROOT))
                goto fail_tree_roots;
 
        free_root_pointers(fs_info, 0);
@@ -3680,6 +3687,7 @@ int btrfs_calc_num_tolerated_disk_barrier_failures(
 
 static int write_all_supers(struct btrfs_root *root, int max_mirrors)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct list_head *head;
        struct btrfs_device *dev;
        struct btrfs_super_block *sb;
@@ -3690,23 +3698,23 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors)
        int total_errors = 0;
        u64 flags;
 
-       do_barriers = !btrfs_test_opt(root->fs_info, NOBARRIER);
-       backup_super_roots(root->fs_info);
+       do_barriers = !btrfs_test_opt(fs_info, NOBARRIER);
+       backup_super_roots(fs_info);
 
-       sb = root->fs_info->super_for_commit;
+       sb = fs_info->super_for_commit;
        dev_item = &sb->dev_item;
 
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
-       head = &root->fs_info->fs_devices->devices;
-       max_errors = btrfs_super_num_devices(root->fs_info->super_copy) - 1;
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
+       head = &fs_info->fs_devices->devices;
+       max_errors = btrfs_super_num_devices(fs_info->super_copy) - 1;
 
        if (do_barriers) {
-               ret = barrier_all_devices(root->fs_info);
+               ret = barrier_all_devices(fs_info);
                if (ret) {
                        mutex_unlock(
-                               &root->fs_info->fs_devices->device_list_mutex);
-                       btrfs_handle_fs_error(root->fs_info, ret,
-                                   "errors while submitting device barriers.");
+                               &fs_info->fs_devices->device_list_mutex);
+                       btrfs_handle_fs_error(fs_info, ret,
+                                             "errors while submitting device barriers.");
                        return ret;
                }
        }
@@ -3740,13 +3748,14 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors)
                        total_errors++;
        }
        if (total_errors > max_errors) {
-               btrfs_err(root->fs_info, "%d errors while writing supers",
-                      total_errors);
-               mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+               btrfs_err(fs_info, "%d errors while writing supers",
+                         total_errors);
+               mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
                /* FUA is masked off if unsupported and can't be the reason */
-               btrfs_handle_fs_error(root->fs_info, -EIO,
-                           "%d errors while writing supers", total_errors);
+               btrfs_handle_fs_error(fs_info, -EIO,
+                                     "%d errors while writing supers",
+                                     total_errors);
                return -EIO;
        }
 
@@ -3761,10 +3770,11 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors)
                if (ret)
                        total_errors++;
        }
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
        if (total_errors > max_errors) {
-               btrfs_handle_fs_error(root->fs_info, -EIO,
-                           "%d errors while writing supers", total_errors);
+               btrfs_handle_fs_error(fs_info, -EIO,
+                                     "%d errors while writing supers",
+                                     total_errors);
                return -EIO;
        }
        return 0;
@@ -3884,14 +3894,14 @@ int btrfs_commit_super(struct btrfs_fs_info *fs_info)
        struct btrfs_root *root = fs_info->tree_root;
        struct btrfs_trans_handle *trans;
 
-       mutex_lock(&root->fs_info->cleaner_mutex);
+       mutex_lock(&fs_info->cleaner_mutex);
        btrfs_run_delayed_iputs(root);
-       mutex_unlock(&root->fs_info->cleaner_mutex);
-       wake_up_process(root->fs_info->cleaner_kthread);
+       mutex_unlock(&fs_info->cleaner_mutex);
+       wake_up_process(fs_info->cleaner_kthread);
 
        /* wait until ongoing cleanup work done */
-       down_write(&root->fs_info->cleanup_work_sem);
-       up_write(&root->fs_info->cleanup_work_sem);
+       down_write(&fs_info->cleanup_work_sem);
+       up_write(&fs_info->cleanup_work_sem);
 
        trans = btrfs_join_transaction(root);
        if (IS_ERR(trans))
@@ -3936,7 +3946,7 @@ void close_ctree(struct btrfs_fs_info *fs_info)
                 * block groups queued for removal, the deletion will be
                 * skipped when we quit the cleaner thread.
                 */
-               btrfs_delete_unused_bgs(root->fs_info);
+               btrfs_delete_unused_bgs(fs_info);
 
                ret = btrfs_commit_super(fs_info);
                if (ret)
@@ -3980,7 +3990,7 @@ void close_ctree(struct btrfs_fs_info *fs_info)
        iput(fs_info->btree_inode);
 
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
-       if (btrfs_test_opt(root->fs_info, CHECK_INTEGRITY))
+       if (btrfs_test_opt(fs_info, CHECK_INTEGRITY))
                btrfsic_unmount(root, fs_info->fs_devices);
 #endif
 
@@ -3998,7 +4008,7 @@ void close_ctree(struct btrfs_fs_info *fs_info)
        __btrfs_free_block_rsv(root->orphan_block_rsv);
        root->orphan_block_rsv = NULL;
 
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
        while (!list_empty(&fs_info->pinned_chunks)) {
                struct extent_map *em;
 
@@ -4007,7 +4017,7 @@ void close_ctree(struct btrfs_fs_info *fs_info)
                list_del_init(&em->list);
                free_extent_map(em);
        }
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
 }
 
 int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
@@ -4029,6 +4039,7 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
 
 void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
 {
+       struct btrfs_fs_info *fs_info;
        struct btrfs_root *root;
        u64 transid = btrfs_header_generation(buf);
        int was_dirty;
@@ -4043,15 +4054,16 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
                return;
 #endif
        root = BTRFS_I(buf->pages[0]->mapping->host)->root;
+       fs_info = root->fs_info;
        btrfs_assert_tree_locked(buf);
-       if (transid != root->fs_info->generation)
+       if (transid != fs_info->generation)
                WARN(1, KERN_CRIT "btrfs transid mismatch buffer %llu, found %llu running %llu\n",
-                       buf->start, transid, root->fs_info->generation);
+                       buf->start, transid, fs_info->generation);
        was_dirty = set_extent_buffer_dirty(buf);
        if (!was_dirty)
-               __percpu_counter_add(&root->fs_info->dirty_metadata_bytes,
+               __percpu_counter_add(&fs_info->dirty_metadata_bytes,
                                     buf->len,
-                                    root->fs_info->dirty_metadata_batch);
+                                    fs_info->dirty_metadata_batch);
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
        if (btrfs_header_level(buf) == 0 && check_leaf(root, buf)) {
                btrfs_print_leaf(root, buf);
@@ -4063,6 +4075,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
 static void __btrfs_btree_balance_dirty(struct btrfs_root *root,
                                        int flush_delayed)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        /*
         * looks as though older kernels can get into trouble with
         * this code, they end up stuck in balance_dirty_pages forever
@@ -4075,11 +4088,10 @@ static void __btrfs_btree_balance_dirty(struct btrfs_root *root,
        if (flush_delayed)
                btrfs_balance_delayed_items(root);
 
-       ret = percpu_counter_compare(&root->fs_info->dirty_metadata_bytes,
+       ret = percpu_counter_compare(&fs_info->dirty_metadata_bytes,
                                     BTRFS_DIRTY_METADATA_THRESH);
        if (ret > 0) {
-               balance_dirty_pages_ratelimited(
-                                  root->fs_info->btree_inode->i_mapping);
+               balance_dirty_pages_ratelimited(fs_info->btree_inode->i_mapping);
        }
 }
 
@@ -4249,12 +4261,14 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
 
 static void btrfs_error_commit_super(struct btrfs_root *root)
 {
-       mutex_lock(&root->fs_info->cleaner_mutex);
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       mutex_lock(&fs_info->cleaner_mutex);
        btrfs_run_delayed_iputs(root);
-       mutex_unlock(&root->fs_info->cleaner_mutex);
+       mutex_unlock(&fs_info->cleaner_mutex);
 
-       down_write(&root->fs_info->cleanup_work_sem);
-       up_write(&root->fs_info->cleanup_work_sem);
+       down_write(&fs_info->cleanup_work_sem);
+       up_write(&fs_info->cleanup_work_sem);
 
        /* cleanup FS via transaction */
        btrfs_cleanup_transaction(root);
@@ -4302,6 +4316,7 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
 static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
                                      struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *node;
        struct btrfs_delayed_ref_root *delayed_refs;
        struct btrfs_delayed_ref_node *ref;
@@ -4312,7 +4327,7 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
        spin_lock(&delayed_refs->lock);
        if (atomic_read(&delayed_refs->num_entries) == 0) {
                spin_unlock(&delayed_refs->lock);
-               btrfs_info(root->fs_info, "delayed_refs has NO entry");
+               btrfs_info(fs_info, "delayed_refs has NO entry");
                return ret;
        }
 
@@ -4425,6 +4440,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
                                        struct extent_io_tree *dirty_pages,
                                        int mark)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        struct extent_buffer *eb;
        u64 start = 0;
@@ -4438,8 +4454,8 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
 
                clear_extent_bits(dirty_pages, start, end, mark);
                while (start <= end) {
-                       eb = find_extent_buffer(root->fs_info, start);
-                       start += root->fs_info->nodesize;
+                       eb = find_extent_buffer(fs_info, start);
+                       start += fs_info->nodesize;
                        if (!eb)
                                continue;
                        wait_on_extent_buffer_writeback(eb);
@@ -4457,6 +4473,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
 static int btrfs_destroy_pinned_extent(struct btrfs_root *root,
                                       struct extent_io_tree *pinned_extents)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_io_tree *unpin;
        u64 start;
        u64 end;
@@ -4477,10 +4494,10 @@ static int btrfs_destroy_pinned_extent(struct btrfs_root *root,
        }
 
        if (loop) {
-               if (unpin == &root->fs_info->freed_extents[0])
-                       unpin = &root->fs_info->freed_extents[1];
+               if (unpin == &fs_info->freed_extents[0])
+                       unpin = &fs_info->freed_extents[1];
                else
-                       unpin = &root->fs_info->freed_extents[0];
+                       unpin = &fs_info->freed_extents[0];
                loop = false;
                goto again;
        }
@@ -4505,6 +4522,7 @@ static void btrfs_cleanup_bg_io(struct btrfs_block_group_cache *cache)
 void btrfs_cleanup_dirty_bgs(struct btrfs_transaction *cur_trans,
                             struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
 
        spin_lock(&cur_trans->dirty_bgs_lock);
@@ -4513,8 +4531,7 @@ void btrfs_cleanup_dirty_bgs(struct btrfs_transaction *cur_trans,
                                         struct btrfs_block_group_cache,
                                         dirty_list);
                if (!cache) {
-                       btrfs_err(root->fs_info,
-                                 "orphan block group dirty_bgs list");
+                       btrfs_err(fs_info, "orphan block group dirty_bgs list");
                        spin_unlock(&cur_trans->dirty_bgs_lock);
                        return;
                }
@@ -4542,8 +4559,7 @@ void btrfs_cleanup_dirty_bgs(struct btrfs_transaction *cur_trans,
                                         struct btrfs_block_group_cache,
                                         io_list);
                if (!cache) {
-                       btrfs_err(root->fs_info,
-                                 "orphan block group on io_bgs list");
+                       btrfs_err(fs_info, "orphan block group on io_bgs list");
                        return;
                }
 
@@ -4558,6 +4574,7 @@ void btrfs_cleanup_dirty_bgs(struct btrfs_transaction *cur_trans,
 void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
                                   struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        btrfs_cleanup_dirty_bgs(cur_trans, root);
        ASSERT(list_empty(&cur_trans->dirty_bgs));
        ASSERT(list_empty(&cur_trans->io_bgs));
@@ -4565,10 +4582,10 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
        btrfs_destroy_delayed_refs(cur_trans, root);
 
        cur_trans->state = TRANS_STATE_COMMIT_START;
-       wake_up(&root->fs_info->transaction_blocked_wait);
+       wake_up(&fs_info->transaction_blocked_wait);
 
        cur_trans->state = TRANS_STATE_UNBLOCKED;
-       wake_up(&root->fs_info->transaction_wait);
+       wake_up(&fs_info->transaction_wait);
 
        btrfs_destroy_delayed_inodes(root);
        btrfs_assert_delayed_root_empty(root);
@@ -4576,7 +4593,7 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
        btrfs_destroy_marked_extents(root, &cur_trans->dirty_pages,
                                     EXTENT_DIRTY);
        btrfs_destroy_pinned_extent(root,
-                                   root->fs_info->pinned_extents);
+                                   fs_info->pinned_extents);
 
        cur_trans->state =TRANS_STATE_COMPLETED;
        wake_up(&cur_trans->commit_wait);
@@ -4589,25 +4606,26 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
 
 static int btrfs_cleanup_transaction(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_transaction *t;
 
-       mutex_lock(&root->fs_info->transaction_kthread_mutex);
+       mutex_lock(&fs_info->transaction_kthread_mutex);
 
-       spin_lock(&root->fs_info->trans_lock);
-       while (!list_empty(&root->fs_info->trans_list)) {
-               t = list_first_entry(&root->fs_info->trans_list,
+       spin_lock(&fs_info->trans_lock);
+       while (!list_empty(&fs_info->trans_list)) {
+               t = list_first_entry(&fs_info->trans_list,
                                     struct btrfs_transaction, list);
                if (t->state >= TRANS_STATE_COMMIT_START) {
                        atomic_inc(&t->use_count);
-                       spin_unlock(&root->fs_info->trans_lock);
+                       spin_unlock(&fs_info->trans_lock);
                        btrfs_wait_for_commit(root, t->transid);
                        btrfs_put_transaction(t);
-                       spin_lock(&root->fs_info->trans_lock);
+                       spin_lock(&fs_info->trans_lock);
                        continue;
                }
-               if (t == root->fs_info->running_transaction) {
+               if (t == fs_info->running_transaction) {
                        t->state = TRANS_STATE_COMMIT_DOING;
-                       spin_unlock(&root->fs_info->trans_lock);
+                       spin_unlock(&fs_info->trans_lock);
                        /*
                         * We wait for 0 num_writers since we don't hold a trans
                         * handle open currently for this transaction.
@@ -4615,27 +4633,27 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root)
                        wait_event(t->writer_wait,
                                   atomic_read(&t->num_writers) == 0);
                } else {
-                       spin_unlock(&root->fs_info->trans_lock);
+                       spin_unlock(&fs_info->trans_lock);
                }
                btrfs_cleanup_one_transaction(t, root);
 
-               spin_lock(&root->fs_info->trans_lock);
-               if (t == root->fs_info->running_transaction)
-                       root->fs_info->running_transaction = NULL;
+               spin_lock(&fs_info->trans_lock);
+               if (t == fs_info->running_transaction)
+                       fs_info->running_transaction = NULL;
                list_del_init(&t->list);
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
 
                btrfs_put_transaction(t);
                trace_btrfs_transaction_commit(root);
-               spin_lock(&root->fs_info->trans_lock);
+               spin_lock(&fs_info->trans_lock);
        }
-       spin_unlock(&root->fs_info->trans_lock);
-       btrfs_destroy_all_ordered_extents(root->fs_info);
+       spin_unlock(&fs_info->trans_lock);
+       btrfs_destroy_all_ordered_extents(fs_info);
        btrfs_destroy_delayed_inodes(root);
        btrfs_assert_delayed_root_empty(root);
-       btrfs_destroy_pinned_extent(root, root->fs_info->pinned_extents);
-       btrfs_destroy_all_delalloc_inodes(root->fs_info);
-       mutex_unlock(&root->fs_info->transaction_kthread_mutex);
+       btrfs_destroy_pinned_extent(root, fs_info->pinned_extents);
+       btrfs_destroy_all_delalloc_inodes(fs_info);
+       mutex_unlock(&fs_info->transaction_kthread_mutex);
 
        return 0;
 }
index 2513a7f533342c827c5c5e1150de6a3d196879ac..340d90751263ca22c0fec999def023343401b3b4 100644 (file)
@@ -153,6 +153,7 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh,
 static struct dentry *btrfs_get_parent(struct dentry *child)
 {
        struct inode *dir = d_inode(child);
+       struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);
        struct btrfs_root *root = BTRFS_I(dir)->root;
        struct btrfs_path *path;
        struct extent_buffer *leaf;
@@ -169,7 +170,7 @@ static struct dentry *btrfs_get_parent(struct dentry *child)
                key.objectid = root->root_key.objectid;
                key.type = BTRFS_ROOT_BACKREF_KEY;
                key.offset = (u64)-1;
-               root = root->fs_info->tree_root;
+               root = fs_info->tree_root;
        } else {
                key.objectid = btrfs_ino(dir);
                key.type = BTRFS_INODE_REF_KEY;
@@ -205,13 +206,13 @@ static struct dentry *btrfs_get_parent(struct dentry *child)
        btrfs_free_path(path);
 
        if (found_key.type == BTRFS_ROOT_BACKREF_KEY) {
-               return btrfs_get_dentry(root->fs_info->sb, key.objectid,
+               return btrfs_get_dentry(fs_info->sb, key.objectid,
                                        found_key.offset, 0, 0);
        }
 
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
-       return d_obtain_alias(btrfs_iget(root->fs_info->sb, &key, root, NULL));
+       return d_obtain_alias(btrfs_iget(fs_info->sb, &key, root, NULL));
 fail:
        btrfs_free_path(path);
        return ERR_PTR(ret);
@@ -222,6 +223,7 @@ static int btrfs_get_name(struct dentry *parent, char *name,
 {
        struct inode *inode = d_inode(child);
        struct inode *dir = d_inode(parent);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_path *path;
        struct btrfs_root *root = BTRFS_I(dir)->root;
        struct btrfs_inode_ref *iref;
@@ -250,7 +252,7 @@ static int btrfs_get_name(struct dentry *parent, char *name,
                key.objectid = BTRFS_I(inode)->root->root_key.objectid;
                key.type = BTRFS_ROOT_BACKREF_KEY;
                key.offset = (u64)-1;
-               root = root->fs_info->tree_root;
+               root = fs_info->tree_root;
        } else {
                key.objectid = ino;
                key.offset = btrfs_ino(dir);
index 2e395d46ba9c7426d7f6bc3602de47b5832b20e9..03512c6f496486541968215afb587dd85bb56ba6 100644 (file)
@@ -226,10 +226,11 @@ block_group_cache_tree_search(struct btrfs_fs_info *info, u64 bytenr,
 static int add_excluded_extent(struct btrfs_root *root,
                               u64 start, u64 num_bytes)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 end = start + num_bytes - 1;
-       set_extent_bits(&root->fs_info->freed_extents[0],
+       set_extent_bits(&fs_info->freed_extents[0],
                        start, end, EXTENT_UPTODATE);
-       set_extent_bits(&root->fs_info->freed_extents[1],
+       set_extent_bits(&fs_info->freed_extents[1],
                        start, end, EXTENT_UPTODATE);
        return 0;
 }
@@ -237,20 +238,22 @@ static int add_excluded_extent(struct btrfs_root *root,
 static void free_excluded_extents(struct btrfs_root *root,
                                  struct btrfs_block_group_cache *cache)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 start, end;
 
        start = cache->key.objectid;
        end = start + cache->key.offset - 1;
 
-       clear_extent_bits(&root->fs_info->freed_extents[0],
+       clear_extent_bits(&fs_info->freed_extents[0],
                          start, end, EXTENT_UPTODATE);
-       clear_extent_bits(&root->fs_info->freed_extents[1],
+       clear_extent_bits(&fs_info->freed_extents[1],
                          start, end, EXTENT_UPTODATE);
 }
 
 static int exclude_super_stripes(struct btrfs_root *root,
                                 struct btrfs_block_group_cache *cache)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 bytenr;
        u64 *logical;
        int stripe_len;
@@ -267,7 +270,7 @@ static int exclude_super_stripes(struct btrfs_root *root,
 
        for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
                bytenr = btrfs_sb_offset(i);
-               ret = btrfs_rmap_block(root->fs_info, cache->key.objectid,
+               ret = btrfs_rmap_block(fs_info, cache->key.objectid,
                                       bytenr, 0, &logical, &nr, &stripe_len);
                if (ret)
                        return ret;
@@ -332,10 +335,12 @@ static void put_caching_control(struct btrfs_caching_control *ctl)
 static void fragment_free_space(struct btrfs_root *root,
                                struct btrfs_block_group_cache *block_group)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        u64 start = block_group->key.objectid;
        u64 len = block_group->key.offset;
        u64 chunk = block_group->flags & BTRFS_BLOCK_GROUP_METADATA ?
-               root->fs_info->nodesize : root->fs_info->sectorsize;
+               fs_info->nodesize : fs_info->sectorsize;
        u64 step = chunk << 1;
 
        while (len > chunk) {
@@ -394,9 +399,9 @@ u64 add_new_free_space(struct btrfs_block_group_cache *block_group,
 
 static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl)
 {
-       struct btrfs_block_group_cache *block_group;
-       struct btrfs_fs_info *fs_info;
-       struct btrfs_root *extent_root;
+       struct btrfs_block_group_cache *block_group = caching_ctl->block_group;
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
+       struct btrfs_root *extent_root = fs_info->extent_root;
        struct btrfs_path *path;
        struct extent_buffer *leaf;
        struct btrfs_key key;
@@ -406,10 +411,6 @@ static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl)
        int ret;
        bool wakeup = true;
 
-       block_group = caching_ctl->block_group;
-       fs_info = block_group->fs_info;
-       extent_root = fs_info->extent_root;
-
        path = btrfs_alloc_path();
        if (!path)
                return -ENOMEM;
@@ -780,6 +781,7 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info)
 /* simple helper to search for an existing data extent at a given offset */
 int btrfs_lookup_data_extent(struct btrfs_root *root, u64 start, u64 len)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        struct btrfs_key key;
        struct btrfs_path *path;
@@ -791,8 +793,7 @@ int btrfs_lookup_data_extent(struct btrfs_root *root, u64 start, u64 len)
        key.objectid = start;
        key.offset = len;
        key.type = BTRFS_EXTENT_ITEM_KEY;
-       ret = btrfs_search_slot(NULL, root->fs_info->extent_root, &key, path,
-                               0, 0);
+       ret = btrfs_search_slot(NULL, fs_info->extent_root, &key, path, 0, 0);
        btrfs_free_path(path);
        return ret;
 }
@@ -810,6 +811,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root, u64 bytenr,
                             u64 offset, int metadata, u64 *refs, u64 *flags)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_delayed_ref_head *head;
        struct btrfs_delayed_ref_root *delayed_refs;
        struct btrfs_path *path;
@@ -825,8 +827,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
         * If we don't have skinny metadata, don't bother doing anything
         * different
         */
-       if (metadata && !btrfs_fs_incompat(root->fs_info, SKINNY_METADATA)) {
-               offset = root->fs_info->nodesize;
+       if (metadata && !btrfs_fs_incompat(fs_info, SKINNY_METADATA)) {
+               offset = fs_info->nodesize;
                metadata = 0;
        }
 
@@ -847,8 +849,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
        else
                key.type = BTRFS_EXTENT_ITEM_KEY;
 
-       ret = btrfs_search_slot(trans, root->fs_info->extent_root,
-                               &key, path, 0, 0);
+       ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 0);
        if (ret < 0)
                goto out_free;
 
@@ -859,7 +860,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
                                              path->slots[0]);
                        if (key.objectid == bytenr &&
                            key.type == BTRFS_EXTENT_ITEM_KEY &&
-                           key.offset == root->fs_info->nodesize)
+                           key.offset == fs_info->nodesize)
                                ret = 0;
                }
        }
@@ -1540,6 +1541,7 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,
                                 u64 parent, u64 root_objectid,
                                 u64 owner, u64 offset, int insert)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key key;
        struct extent_buffer *leaf;
        struct btrfs_extent_item *ei;
@@ -1553,8 +1555,7 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,
        int want;
        int ret;
        int err = 0;
-       bool skinny_metadata = btrfs_fs_incompat(root->fs_info,
-                                                SKINNY_METADATA);
+       bool skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
 
        key.objectid = bytenr;
        key.type = BTRFS_EXTENT_ITEM_KEY;
@@ -2025,6 +2026,7 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
 int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
                         u64 num_bytes, u64 *actual_bytes)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        u64 discarded_bytes = 0;
        struct btrfs_bio *bbio = NULL;
@@ -2034,10 +2036,10 @@ int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
         * Avoid races with device replace and make sure our bbio has devices
         * associated to its stripes that don't go away while we are discarding.
         */
-       btrfs_bio_counter_inc_blocked(root->fs_info);
+       btrfs_bio_counter_inc_blocked(fs_info);
        /* Tell the block device(s) that the sectors can be discarded */
-       ret = btrfs_map_block(root->fs_info, BTRFS_MAP_DISCARD,
-                             bytenr, &num_bytes, &bbio, 0);
+       ret = btrfs_map_block(fs_info, BTRFS_MAP_DISCARD, bytenr, &num_bytes,
+                             &bbio, 0);
        /* Error condition is -ENOMEM */
        if (!ret) {
                struct btrfs_bio_stripe *stripe = bbio->stripes;
@@ -2067,7 +2069,7 @@ int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
                }
                btrfs_put_bbio(bbio);
        }
-       btrfs_bio_counter_dec(root->fs_info);
+       btrfs_bio_counter_dec(fs_info);
 
        if (actual_bytes)
                *actual_bytes = discarded_bytes;
@@ -2154,7 +2156,7 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
        path->reada = READA_FORWARD;
        path->leave_spinning = 1;
        /* now insert the actual backref */
-       ret = insert_extent_backref(trans, root->fs_info->extent_root,
+       ret = insert_extent_backref(trans, fs_info->extent_root,
                                    path, bytenr, parent, root_objectid,
                                    owner, offset, refs_to_add);
        if (ret)
@@ -2170,6 +2172,7 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans,
                                struct btrfs_delayed_extent_op *extent_op,
                                int insert_reserved)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret = 0;
        struct btrfs_delayed_data_ref *ref;
        struct btrfs_key ins;
@@ -2182,7 +2185,7 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans,
        ins.type = BTRFS_EXTENT_ITEM_KEY;
 
        ref = btrfs_delayed_node_to_data_ref(node);
-       trace_run_delayed_data_ref(root->fs_info, node, ref, node->action);
+       trace_run_delayed_data_ref(fs_info, node, ref, node->action);
 
        if (node->type == BTRFS_SHARED_DATA_REF_KEY)
                parent = ref->parent;
@@ -2234,6 +2237,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans,
                                 struct btrfs_delayed_ref_node *node,
                                 struct btrfs_delayed_extent_op *extent_op)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key key;
        struct btrfs_path *path;
        struct btrfs_extent_item *ei;
@@ -2246,7 +2250,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans,
        if (trans->aborted)
                return 0;
 
-       if (metadata && !btrfs_fs_incompat(root->fs_info, SKINNY_METADATA))
+       if (metadata && !btrfs_fs_incompat(fs_info, SKINNY_METADATA))
                metadata = 0;
 
        path = btrfs_alloc_path();
@@ -2266,8 +2270,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans,
 again:
        path->reada = READA_FORWARD;
        path->leave_spinning = 1;
-       ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key,
-                               path, 0, 1);
+       ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 1);
        if (ret < 0) {
                err = ret;
                goto out;
@@ -2302,7 +2305,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans,
        item_size = btrfs_item_size_nr(leaf, path->slots[0]);
 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0
        if (item_size < sizeof(*ei)) {
-               ret = convert_extent_item_v0(trans, root->fs_info->extent_root,
+               ret = convert_extent_item_v0(trans, fs_info->extent_root,
                                             path, (u64)-1, 0);
                if (ret < 0) {
                        err = ret;
@@ -2328,16 +2331,16 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,
                                struct btrfs_delayed_extent_op *extent_op,
                                int insert_reserved)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret = 0;
        struct btrfs_delayed_tree_ref *ref;
        struct btrfs_key ins;
        u64 parent = 0;
        u64 ref_root = 0;
-       bool skinny_metadata = btrfs_fs_incompat(root->fs_info,
-                                                SKINNY_METADATA);
+       bool skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
 
        ref = btrfs_delayed_node_to_tree_ref(node);
-       trace_run_delayed_tree_ref(root->fs_info, node, ref, node->action);
+       trace_run_delayed_tree_ref(fs_info, node, ref, node->action);
 
        if (node->type == BTRFS_SHARED_BLOCK_REF_KEY)
                parent = ref->parent;
@@ -2388,6 +2391,7 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,
                               struct btrfs_delayed_extent_op *extent_op,
                               int insert_reserved)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret = 0;
 
        if (trans->aborted) {
@@ -2407,22 +2411,20 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,
                 */
                BUG_ON(extent_op);
                head = btrfs_delayed_node_to_head(node);
-               trace_run_delayed_ref_head(root->fs_info, node, head,
-                                          node->action);
+               trace_run_delayed_ref_head(fs_info, node, head, node->action);
 
                if (insert_reserved) {
                        btrfs_pin_extent(root, node->bytenr,
                                         node->num_bytes, 1);
                        if (head->is_data) {
-                               ret = btrfs_del_csums(trans, root->fs_info,
+                               ret = btrfs_del_csums(trans, fs_info,
                                                      node->bytenr,
                                                      node->num_bytes);
                        }
                }
 
                /* Also free its reserved qgroup space */
-               btrfs_qgroup_free_delayed_ref(root->fs_info,
-                                             head->qgroup_ref_root,
+               btrfs_qgroup_free_delayed_ref(fs_info, head->qgroup_ref_root,
                                              head->qgroup_reserved);
                return ret;
        }
@@ -2748,18 +2750,19 @@ static u64 find_middle(struct rb_root *root)
 
 static inline u64 heads_to_leaves(struct btrfs_root *root, u64 heads)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 num_bytes;
 
        num_bytes = heads * (sizeof(struct btrfs_extent_item) +
                             sizeof(struct btrfs_extent_inline_ref));
-       if (!btrfs_fs_incompat(root->fs_info, SKINNY_METADATA))
+       if (!btrfs_fs_incompat(fs_info, SKINNY_METADATA))
                num_bytes += heads * sizeof(struct btrfs_tree_block_info);
 
        /*
         * We don't ever fill up leaves all the way so multiply by 2 just to be
         * closer to what we're really going to want to use.
         */
-       return div_u64(num_bytes, BTRFS_LEAF_DATA_SIZE(root->fs_info));
+       return div_u64(num_bytes, BTRFS_LEAF_DATA_SIZE(fs_info));
 }
 
 /*
@@ -2768,14 +2771,15 @@ static inline u64 heads_to_leaves(struct btrfs_root *root, u64 heads)
  */
 u64 btrfs_csum_bytes_to_leaves(struct btrfs_root *root, u64 csum_bytes)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 csum_size;
        u64 num_csums_per_leaf;
        u64 num_csums;
 
-       csum_size = BTRFS_MAX_ITEM_SIZE(root->fs_info);
+       csum_size = BTRFS_MAX_ITEM_SIZE(fs_info);
        num_csums_per_leaf = div64_u64(csum_size,
-                       (u64)btrfs_super_csum_size(root->fs_info->super_copy));
-       num_csums = div64_u64(csum_bytes, root->fs_info->sectorsize);
+                       (u64)btrfs_super_csum_size(fs_info->super_copy));
+       num_csums = div64_u64(csum_bytes, fs_info->sectorsize);
        num_csums += num_csums_per_leaf - 1;
        num_csums = div64_u64(num_csums, num_csums_per_leaf);
        return num_csums;
@@ -2784,6 +2788,7 @@ u64 btrfs_csum_bytes_to_leaves(struct btrfs_root *root, u64 csum_bytes)
 int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans,
                                       struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *global_rsv;
        u64 num_heads = trans->transaction->delayed_refs.num_heads_ready;
        u64 csum_bytes = trans->transaction->delayed_refs.pending_csums;
@@ -2791,15 +2796,15 @@ int btrfs_check_space_for_delayed_refs(struct btrfs_trans_handle *trans,
        u64 num_bytes, num_dirty_bgs_bytes;
        int ret = 0;
 
-       num_bytes = btrfs_calc_trans_metadata_size(root->fs_info, 1);
+       num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
        num_heads = heads_to_leaves(root, num_heads);
        if (num_heads > 1)
-               num_bytes += (num_heads - 1) * root->fs_info->nodesize;
+               num_bytes += (num_heads - 1) * fs_info->nodesize;
        num_bytes <<= 1;
-       num_bytes += btrfs_csum_bytes_to_leaves(root, csum_bytes) * root->fs_info->nodesize;
-       num_dirty_bgs_bytes = btrfs_calc_trans_metadata_size(root->fs_info,
+       num_bytes += btrfs_csum_bytes_to_leaves(root, csum_bytes) * fs_info->nodesize;
+       num_dirty_bgs_bytes = btrfs_calc_trans_metadata_size(fs_info,
                                                             num_dirty_bgs);
-       global_rsv = &root->fs_info->global_block_rsv;
+       global_rsv = &fs_info->global_block_rsv;
 
        /*
         * If we can't allocate any more chunks lets make sure we have _lots_ of
@@ -2892,6 +2897,7 @@ static void delayed_ref_async_start(struct btrfs_work *work)
 int btrfs_async_run_delayed_refs(struct btrfs_root *root,
                                 unsigned long count, u64 transid, int wait)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct async_delayed_refs *async;
        int ret;
 
@@ -2899,7 +2905,7 @@ int btrfs_async_run_delayed_refs(struct btrfs_root *root,
        if (!async)
                return -ENOMEM;
 
-       async->root = root->fs_info->tree_root;
+       async->root = fs_info->tree_root;
        async->count = count;
        async->error = 0;
        async->transid = transid;
@@ -2912,7 +2918,7 @@ int btrfs_async_run_delayed_refs(struct btrfs_root *root,
        btrfs_init_work(&async->work, btrfs_extent_refs_helper,
                        delayed_ref_async_start, NULL, NULL);
 
-       btrfs_queue_work(root->fs_info->extent_workers, &async->work);
+       btrfs_queue_work(fs_info->extent_workers, &async->work);
 
        if (wait) {
                wait_for_completion(&async->wait);
@@ -2936,6 +2942,7 @@ int btrfs_async_run_delayed_refs(struct btrfs_root *root,
 int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root, unsigned long count)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *node;
        struct btrfs_delayed_ref_root *delayed_refs;
        struct btrfs_delayed_ref_head *head;
@@ -2947,11 +2954,11 @@ int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,
        if (trans->aborted)
                return 0;
 
-       if (test_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &root->fs_info->flags))
+       if (test_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags))
                return 0;
 
-       if (root == root->fs_info->extent_root)
-               root = root->fs_info->tree_root;
+       if (root == fs_info->extent_root)
+               root = fs_info->tree_root;
 
        delayed_refs = &trans->transaction->delayed_refs;
        if (count == 0)
@@ -3019,6 +3026,7 @@ int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,
                                u64 bytenr, u64 num_bytes, u64 flags,
                                int level, int is_data)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_delayed_extent_op *extent_op;
        int ret;
 
@@ -3032,7 +3040,7 @@ int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,
        extent_op->is_data = is_data ? true : false;
        extent_op->level = level;
 
-       ret = btrfs_add_delayed_extent_op(root->fs_info, trans, bytenr,
+       ret = btrfs_add_delayed_extent_op(fs_info, trans, bytenr,
                                          num_bytes, extent_op);
        if (ret)
                btrfs_free_delayed_extent_op(extent_op);
@@ -3106,7 +3114,8 @@ static noinline int check_committed_ref(struct btrfs_trans_handle *trans,
                                        struct btrfs_path *path,
                                        u64 objectid, u64 offset, u64 bytenr)
 {
-       struct btrfs_root *extent_root = root->fs_info->extent_root;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_root *extent_root = fs_info->extent_root;
        struct extent_buffer *leaf;
        struct btrfs_extent_data_ref *ref;
        struct btrfs_extent_inline_ref *iref;
@@ -3213,6 +3222,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
                           struct extent_buffer *buf,
                           int full_backref, int inc)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 bytenr;
        u64 num_bytes;
        u64 parent;
@@ -3227,7 +3237,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
                            u64, u64, u64, u64, u64, u64);
 
 
-       if (btrfs_is_testing(root->fs_info))
+       if (btrfs_is_testing(fs_info))
                return 0;
 
        ref_root = btrfs_header_owner(buf);
@@ -3270,7 +3280,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
                                goto fail;
                } else {
                        bytenr = btrfs_node_blockptr(buf, i);
-                       num_bytes = root->fs_info->nodesize;
+                       num_bytes = fs_info->nodesize;
                        ret = process_func(trans, root, bytenr, num_bytes,
                                           parent, ref_root, level - 1, 0);
                        if (ret)
@@ -3300,7 +3310,8 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
                                 struct btrfs_block_group_cache *cache)
 {
        int ret;
-       struct btrfs_root *extent_root = root->fs_info->extent_root;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_root *extent_root = fs_info->extent_root;
        unsigned long bi;
        struct extent_buffer *leaf;
 
@@ -3325,19 +3336,18 @@ static struct btrfs_block_group_cache *
 next_block_group(struct btrfs_root *root,
                 struct btrfs_block_group_cache *cache)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *node;
 
-       spin_lock(&root->fs_info->block_group_cache_lock);
+       spin_lock(&fs_info->block_group_cache_lock);
 
        /* If our block group was removed, we need a full search. */
        if (RB_EMPTY_NODE(&cache->cache_node)) {
                const u64 next_bytenr = cache->key.objectid + cache->key.offset;
 
-               spin_unlock(&root->fs_info->block_group_cache_lock);
+               spin_unlock(&fs_info->block_group_cache_lock);
                btrfs_put_block_group(cache);
-               cache = btrfs_lookup_first_block_group(root->fs_info,
-                                                      next_bytenr);
-               return cache;
+               cache = btrfs_lookup_first_block_group(fs_info, next_bytenr); return cache;
        }
        node = rb_next(&cache->cache_node);
        btrfs_put_block_group(cache);
@@ -3347,7 +3357,7 @@ next_block_group(struct btrfs_root *root,
                btrfs_get_block_group(cache);
        } else
                cache = NULL;
-       spin_unlock(&root->fs_info->block_group_cache_lock);
+       spin_unlock(&fs_info->block_group_cache_lock);
        return cache;
 }
 
@@ -3355,7 +3365,8 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group,
                            struct btrfs_trans_handle *trans,
                            struct btrfs_path *path)
 {
-       struct btrfs_root *root = block_group->fs_info->tree_root;
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
+       struct btrfs_root *root = fs_info->tree_root;
        struct inode *inode = NULL;
        u64 alloc_hint = 0;
        int dcs = BTRFS_DC_ERROR;
@@ -3429,7 +3440,7 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group,
 
        if (i_size_read(inode) > 0) {
                ret = btrfs_check_trunc_cache_free_space(root,
-                                       &root->fs_info->global_block_rsv);
+                                       &fs_info->global_block_rsv);
                if (ret)
                        goto out_put;
 
@@ -3440,7 +3451,7 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group,
 
        spin_lock(&block_group->lock);
        if (block_group->cached != BTRFS_CACHE_FINISHED ||
-           !btrfs_test_opt(root->fs_info, SPACE_CACHE)) {
+           !btrfs_test_opt(fs_info, SPACE_CACHE)) {
                /*
                 * don't bother trying to write stuff out _if_
                 * a) we're not cached,
@@ -3511,12 +3522,13 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group,
 int btrfs_setup_space_cache(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache, *tmp;
        struct btrfs_transaction *cur_trans = trans->transaction;
        struct btrfs_path *path;
 
        if (list_empty(&cur_trans->dirty_bgs) ||
-           !btrfs_test_opt(root->fs_info, SPACE_CACHE))
+           !btrfs_test_opt(fs_info, SPACE_CACHE))
                return 0;
 
        path = btrfs_alloc_path();
@@ -3549,6 +3561,7 @@ int btrfs_setup_space_cache(struct btrfs_trans_handle *trans,
 int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans,
                                   struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
        struct btrfs_transaction *cur_trans = trans->transaction;
        int ret = 0;
@@ -3622,7 +3635,7 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans,
 
                if (cache->disk_cache_state == BTRFS_DC_SETUP) {
                        cache->io_ctl.inode = NULL;
-                       ret = btrfs_write_out_cache(root->fs_info, trans,
+                       ret = btrfs_write_out_cache(fs_info, trans,
                                                    cache, path);
                        if (ret == 0 && cache->io_ctl.inode) {
                                num_started++;
@@ -3712,6 +3725,7 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans,
 int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
                                   struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
        struct btrfs_transaction *cur_trans = trans->transaction;
        int ret = 0;
@@ -3775,7 +3789,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
 
                if (!ret && cache->disk_cache_state == BTRFS_DC_SETUP) {
                        cache->io_ctl.inode = NULL;
-                       ret = btrfs_write_out_cache(root->fs_info, trans,
+                       ret = btrfs_write_out_cache(fs_info, trans,
                                                    cache, path);
                        if (ret == 0 && cache->io_ctl.inode) {
                                num_started++;
@@ -3836,10 +3850,11 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
 
 int btrfs_extent_readonly(struct btrfs_root *root, u64 bytenr)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *block_group;
        int readonly = 0;
 
-       block_group = btrfs_lookup_block_group(root->fs_info, bytenr);
+       block_group = btrfs_lookup_block_group(fs_info, bytenr);
        if (!block_group || block_group->ro)
                readonly = 1;
        if (block_group)
@@ -4050,7 +4065,8 @@ static u64 get_restripe_target(struct btrfs_fs_info *fs_info, u64 flags)
  */
 static u64 btrfs_reduce_alloc_profile(struct btrfs_root *root, u64 flags)
 {
-       u64 num_devices = root->fs_info->fs_devices->rw_devices;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       u64 num_devices = fs_info->fs_devices->rw_devices;
        u64 target;
        u64 raid_type;
        u64 allowed = 0;
@@ -4059,16 +4075,16 @@ static u64 btrfs_reduce_alloc_profile(struct btrfs_root *root, u64 flags)
         * see if restripe for this chunk_type is in progress, if so
         * try to reduce to the target profile
         */
-       spin_lock(&root->fs_info->balance_lock);
-       target = get_restripe_target(root->fs_info, flags);
+       spin_lock(&fs_info->balance_lock);
+       target = get_restripe_target(fs_info, flags);
        if (target) {
                /* pick target profile only if it's already available */
                if ((flags & target) & BTRFS_EXTENDED_PROFILE_MASK) {
-                       spin_unlock(&root->fs_info->balance_lock);
+                       spin_unlock(&fs_info->balance_lock);
                        return extended_to_chunk(target);
                }
        }
-       spin_unlock(&root->fs_info->balance_lock);
+       spin_unlock(&fs_info->balance_lock);
 
        /* First, mask out the RAID levels which aren't possible */
        for (raid_type = 0; raid_type < BTRFS_NR_RAID_TYPES; raid_type++) {
@@ -4095,32 +4111,34 @@ static u64 btrfs_reduce_alloc_profile(struct btrfs_root *root, u64 flags)
 
 static u64 get_alloc_profile(struct btrfs_root *root, u64 orig_flags)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        unsigned seq;
        u64 flags;
 
        do {
                flags = orig_flags;
-               seq = read_seqbegin(&root->fs_info->profiles_lock);
+               seq = read_seqbegin(&fs_info->profiles_lock);
 
                if (flags & BTRFS_BLOCK_GROUP_DATA)
-                       flags |= root->fs_info->avail_data_alloc_bits;
+                       flags |= fs_info->avail_data_alloc_bits;
                else if (flags & BTRFS_BLOCK_GROUP_SYSTEM)
-                       flags |= root->fs_info->avail_system_alloc_bits;
+                       flags |= fs_info->avail_system_alloc_bits;
                else if (flags & BTRFS_BLOCK_GROUP_METADATA)
-                       flags |= root->fs_info->avail_metadata_alloc_bits;
-       } while (read_seqretry(&root->fs_info->profiles_lock, seq));
+                       flags |= fs_info->avail_metadata_alloc_bits;
+       } while (read_seqretry(&fs_info->profiles_lock, seq));
 
        return btrfs_reduce_alloc_profile(root, flags);
 }
 
 u64 btrfs_get_alloc_profile(struct btrfs_root *root, int data)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 flags;
        u64 ret;
 
        if (data)
                flags = BTRFS_BLOCK_GROUP_DATA;
-       else if (root == root->fs_info->chunk_root)
+       else if (root == fs_info->chunk_root)
                flags = BTRFS_BLOCK_GROUP_SYSTEM;
        else
                flags = BTRFS_BLOCK_GROUP_METADATA;
@@ -4140,7 +4158,7 @@ int btrfs_alloc_data_chunk_ondemand(struct inode *inode, u64 bytes)
        int have_pinned_space;
 
        /* make sure bytes are sectorsize aligned */
-       bytes = ALIGN(bytes, root->fs_info->sectorsize);
+       bytes = ALIGN(bytes, fs_info->sectorsize);
 
        if (btrfs_is_free_space_inode(inode)) {
                need_commit = 0;
@@ -4186,7 +4204,7 @@ int btrfs_alloc_data_chunk_ondemand(struct inode *inode, u64 bytes)
                        if (IS_ERR(trans))
                                return PTR_ERR(trans);
 
-                       ret = do_chunk_alloc(trans, root->fs_info->extent_root,
+                       ret = do_chunk_alloc(trans, fs_info->extent_root,
                                             alloc_target,
                                             CHUNK_ALLOC_NO_FORCE);
                        btrfs_end_transaction(trans, root);
@@ -4218,12 +4236,13 @@ int btrfs_alloc_data_chunk_ondemand(struct inode *inode, u64 bytes)
                /* commit the current transaction and try again */
 commit_trans:
                if (need_commit &&
-                   !atomic_read(&root->fs_info->open_ioctl_trans)) {
+                   !atomic_read(&fs_info->open_ioctl_trans)) {
                        need_commit--;
 
                        if (need_commit > 0) {
                                btrfs_start_delalloc_roots(fs_info, 0, -1);
-                               btrfs_wait_ordered_roots(fs_info, -1, 0, (u64)-1);
+                               btrfs_wait_ordered_roots(fs_info, -1, 0,
+                                                        (u64)-1);
                        }
 
                        trans = btrfs_join_transaction(root);
@@ -4241,21 +4260,21 @@ int btrfs_alloc_data_chunk_ondemand(struct inode *inode, u64 bytes)
                                 * operations. Wait for it to finish so that
                                 * more space is released.
                                 */
-                               mutex_lock(&root->fs_info->cleaner_delayed_iput_mutex);
-                               mutex_unlock(&root->fs_info->cleaner_delayed_iput_mutex);
+                               mutex_lock(&fs_info->cleaner_delayed_iput_mutex);
+                               mutex_unlock(&fs_info->cleaner_delayed_iput_mutex);
                                goto again;
                        } else {
                                btrfs_end_transaction(trans, root);
                        }
                }
 
-               trace_btrfs_space_reservation(root->fs_info,
+               trace_btrfs_space_reservation(fs_info,
                                              "space_info:enospc",
                                              data_sinfo->flags, bytes, 1);
                return -ENOSPC;
        }
        data_sinfo->bytes_may_use += bytes;
-       trace_btrfs_space_reservation(root->fs_info, "space_info",
+       trace_btrfs_space_reservation(fs_info, "space_info",
                                      data_sinfo->flags, bytes, 1);
        spin_unlock(&data_sinfo->lock);
 
@@ -4269,13 +4288,13 @@ int btrfs_alloc_data_chunk_ondemand(struct inode *inode, u64 bytes)
  */
 int btrfs_check_data_free_space(struct inode *inode, u64 start, u64 len)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int ret;
 
        /* align the range */
-       len = round_up(start + len, root->fs_info->sectorsize) -
-             round_down(start, root->fs_info->sectorsize);
-       start = round_down(start, root->fs_info->sectorsize);
+       len = round_up(start + len, fs_info->sectorsize) -
+             round_down(start, fs_info->sectorsize);
+       start = round_down(start, fs_info->sectorsize);
 
        ret = btrfs_alloc_data_chunk_ondemand(inode, len);
        if (ret < 0)
@@ -4299,21 +4318,21 @@ int btrfs_check_data_free_space(struct inode *inode, u64 start, u64 len)
 void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,
                                            u64 len)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_space_info *data_sinfo;
 
        /* Make sure the range is aligned to sectorsize */
-       len = round_up(start + len, root->fs_info->sectorsize) -
-             round_down(start, root->fs_info->sectorsize);
-       start = round_down(start, root->fs_info->sectorsize);
+       len = round_up(start + len, fs_info->sectorsize) -
+             round_down(start, fs_info->sectorsize);
+       start = round_down(start, fs_info->sectorsize);
 
-       data_sinfo = root->fs_info->data_sinfo;
+       data_sinfo = fs_info->data_sinfo;
        spin_lock(&data_sinfo->lock);
        if (WARN_ON(data_sinfo->bytes_may_use < len))
                data_sinfo->bytes_may_use = 0;
        else
                data_sinfo->bytes_may_use -= len;
-       trace_btrfs_space_reservation(root->fs_info, "space_info",
+       trace_btrfs_space_reservation(fs_info, "space_info",
                                      data_sinfo->flags, len, 0);
        spin_unlock(&data_sinfo->lock);
 }
@@ -4359,7 +4378,8 @@ static inline u64 calc_global_rsv_need_space(struct btrfs_block_rsv *global)
 static int should_alloc_chunk(struct btrfs_root *root,
                              struct btrfs_space_info *sinfo, int force)
 {
-       struct btrfs_block_rsv *global_rsv = &root->fs_info->global_block_rsv;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
        u64 num_bytes = sinfo->total_bytes - sinfo->bytes_readonly;
        u64 num_allocated = sinfo->bytes_used + sinfo->bytes_reserved;
        u64 thresh;
@@ -4380,7 +4400,7 @@ static int should_alloc_chunk(struct btrfs_root *root,
         * about 1% of the FS size.
         */
        if (force == CHUNK_ALLOC_LIMITED) {
-               thresh = btrfs_super_total_bytes(root->fs_info->super_copy);
+               thresh = btrfs_super_total_bytes(fs_info->super_copy);
                thresh = max_t(u64, SZ_64M, div_factor_fine(thresh, 1));
 
                if (num_bytes - num_allocated < thresh)
@@ -4394,13 +4414,14 @@ static int should_alloc_chunk(struct btrfs_root *root,
 
 static u64 get_profile_num_devs(struct btrfs_root *root, u64 type)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 num_dev;
 
        if (type & (BTRFS_BLOCK_GROUP_RAID10 |
                    BTRFS_BLOCK_GROUP_RAID0 |
                    BTRFS_BLOCK_GROUP_RAID5 |
                    BTRFS_BLOCK_GROUP_RAID6))
-               num_dev = root->fs_info->fs_devices->rw_devices;
+               num_dev = fs_info->fs_devices->rw_devices;
        else if (type & BTRFS_BLOCK_GROUP_RAID1)
                num_dev = 2;
        else
@@ -4418,6 +4439,7 @@ void check_system_chunk(struct btrfs_trans_handle *trans,
                        struct btrfs_root *root,
                        u64 type)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_space_info *info;
        u64 left;
        u64 thresh;
@@ -4428,9 +4450,9 @@ void check_system_chunk(struct btrfs_trans_handle *trans,
         * Needed because we can end up allocating a system chunk and for an
         * atomic and race free space reservation in the chunk block reserve.
         */
-       ASSERT(mutex_is_locked(&root->fs_info->chunk_mutex));
+       ASSERT(mutex_is_locked(&fs_info->chunk_mutex));
 
-       info = __find_space_info(root->fs_info, BTRFS_BLOCK_GROUP_SYSTEM);
+       info = __find_space_info(fs_info, BTRFS_BLOCK_GROUP_SYSTEM);
        spin_lock(&info->lock);
        left = info->total_bytes - info->bytes_used - info->bytes_pinned -
                info->bytes_reserved - info->bytes_readonly -
@@ -4440,19 +4462,19 @@ void check_system_chunk(struct btrfs_trans_handle *trans,
        num_devs = get_profile_num_devs(root, type);
 
        /* num_devs device items to update and 1 chunk item to add or remove */
-       thresh = btrfs_calc_trunc_metadata_size(root->fs_info, num_devs) +
-               btrfs_calc_trans_metadata_size(root->fs_info, 1);
+       thresh = btrfs_calc_trunc_metadata_size(fs_info, num_devs) +
+               btrfs_calc_trans_metadata_size(fs_info, 1);
 
-       if (left < thresh && btrfs_test_opt(root->fs_info, ENOSPC_DEBUG)) {
-               btrfs_info(root->fs_info, "left=%llu, need=%llu, flags=%llu",
-                       left, thresh, type);
-               dump_space_info(root->fs_info, info, 0, 0);
+       if (left < thresh && btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
+               btrfs_info(fs_info, "left=%llu, need=%llu, flags=%llu",
+                          left, thresh, type);
+               dump_space_info(fs_info, info, 0, 0);
        }
 
        if (left < thresh) {
                u64 flags;
 
-               flags = btrfs_get_alloc_profile(root->fs_info->chunk_root, 0);
+               flags = btrfs_get_alloc_profile(fs_info->chunk_root, 0);
                /*
                 * Ignore failure to create system chunk. We might end up not
                 * needing it, as we might not need to COW all nodes/leafs from
@@ -4463,8 +4485,8 @@ void check_system_chunk(struct btrfs_trans_handle *trans,
        }
 
        if (!ret) {
-               ret = btrfs_block_rsv_add(root->fs_info->chunk_root,
-                                         &root->fs_info->chunk_block_rsv,
+               ret = btrfs_block_rsv_add(fs_info->chunk_root,
+                                         &fs_info->chunk_block_rsv,
                                          thresh, BTRFS_RESERVE_NO_FLUSH);
                if (!ret)
                        trans->chunk_bytes_reserved += thresh;
@@ -4492,10 +4514,9 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
        if (trans->allocating_chunk)
                return -ENOSPC;
 
-       space_info = __find_space_info(extent_root->fs_info, flags);
+       space_info = __find_space_info(fs_info, flags);
        if (!space_info) {
-               ret = update_space_info(extent_root->fs_info, flags,
-                                       0, 0, 0, &space_info);
+               ret = update_space_info(fs_info, flags, 0, 0, 0, &space_info);
                BUG_ON(ret); /* -ENOMEM */
        }
        BUG_ON(!space_info); /* Logic error */
@@ -4607,7 +4628,8 @@ static int can_overcommit(struct btrfs_root *root,
                          struct btrfs_space_info *space_info, u64 bytes,
                          enum btrfs_reserve_flush_enum flush)
 {
-       struct btrfs_block_rsv *global_rsv;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
        u64 profile;
        u64 space_size;
        u64 avail;
@@ -4617,8 +4639,6 @@ static int can_overcommit(struct btrfs_root *root,
        if (space_info->flags & BTRFS_BLOCK_GROUP_DATA)
                return 0;
 
-       BUG_ON(root->fs_info == NULL);
-       global_rsv = &root->fs_info->global_block_rsv;
        profile = btrfs_get_alloc_profile(root, 0);
        used = space_info->bytes_used + space_info->bytes_reserved +
                space_info->bytes_pinned + space_info->bytes_readonly;
@@ -4637,9 +4657,9 @@ static int can_overcommit(struct btrfs_root *root,
 
        used += space_info->bytes_may_use;
 
-       spin_lock(&root->fs_info->free_chunk_lock);
-       avail = root->fs_info->free_chunk_space;
-       spin_unlock(&root->fs_info->free_chunk_lock);
+       spin_lock(&fs_info->free_chunk_lock);
+       avail = fs_info->free_chunk_space;
+       spin_unlock(&fs_info->free_chunk_lock);
 
        /*
         * If we have dup, raid1 or raid10 then only half of the free
@@ -4670,7 +4690,8 @@ static int can_overcommit(struct btrfs_root *root,
 static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root,
                                         unsigned long nr_pages, int nr_items)
 {
-       struct super_block *sb = root->fs_info->sb;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct super_block *sb = fs_info->sb;
 
        if (down_read_trylock(&sb->s_umount)) {
                writeback_inodes_sb_nr(sb, nr_pages, WB_REASON_FS_FREE_SPACE);
@@ -4683,10 +4704,9 @@ static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root,
                 * the filesystem is readonly(all dirty pages are written to
                 * the disk).
                 */
-               btrfs_start_delalloc_roots(root->fs_info, 0, nr_items);
+               btrfs_start_delalloc_roots(fs_info, 0, nr_items);
                if (!current->journal_info)
-                       btrfs_wait_ordered_roots(root->fs_info, nr_items,
-                                                0, (u64)-1);
+                       btrfs_wait_ordered_roots(fs_info, nr_items, 0, (u64)-1);
        }
 }
 
@@ -4710,6 +4730,7 @@ static inline int calc_reclaim_items_nr(struct btrfs_root *root, u64 to_reclaim)
 static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
                            bool wait_ordered)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *block_rsv;
        struct btrfs_space_info *space_info;
        struct btrfs_trans_handle *trans;
@@ -4726,17 +4747,16 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
        to_reclaim = (u64)items * EXTENT_SIZE_PER_ITEM;
 
        trans = (struct btrfs_trans_handle *)current->journal_info;
-       block_rsv = &root->fs_info->delalloc_block_rsv;
+       block_rsv = &fs_info->delalloc_block_rsv;
        space_info = block_rsv->space_info;
 
        delalloc_bytes = percpu_counter_sum_positive(
-                                               &root->fs_info->delalloc_bytes);
+                                               &fs_info->delalloc_bytes);
        if (delalloc_bytes == 0) {
                if (trans)
                        return;
                if (wait_ordered)
-                       btrfs_wait_ordered_roots(root->fs_info, items,
-                                                0, (u64)-1);
+                       btrfs_wait_ordered_roots(fs_info, items, 0, (u64)-1);
                return;
        }
 
@@ -4749,7 +4769,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
                 * We need to wait for the async pages to actually start before
                 * we do anything.
                 */
-               max_reclaim = atomic_read(&root->fs_info->async_delalloc_pages);
+               max_reclaim = atomic_read(&fs_info->async_delalloc_pages);
                if (!max_reclaim)
                        goto skip_async;
 
@@ -4758,8 +4778,8 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
                else
                        max_reclaim -= nr_pages;
 
-               wait_event(root->fs_info->async_submit_wait,
-                          atomic_read(&root->fs_info->async_delalloc_pages) <=
+               wait_event(fs_info->async_submit_wait,
+                          atomic_read(&fs_info->async_delalloc_pages) <=
                           (int)max_reclaim);
 skip_async:
                if (!trans)
@@ -4780,15 +4800,14 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
 
                loops++;
                if (wait_ordered && !trans) {
-                       btrfs_wait_ordered_roots(root->fs_info, items,
-                                                0, (u64)-1);
+                       btrfs_wait_ordered_roots(fs_info, items, 0, (u64)-1);
                } else {
                        time_left = schedule_timeout_killable(1);
                        if (time_left)
                                break;
                }
                delalloc_bytes = percpu_counter_sum_positive(
-                                               &root->fs_info->delalloc_bytes);
+                                               &fs_info->delalloc_bytes);
        }
 }
 
@@ -4806,7 +4825,8 @@ static int may_commit_transaction(struct btrfs_root *root,
                                  struct btrfs_space_info *space_info,
                                  u64 bytes, int force)
 {
-       struct btrfs_block_rsv *delayed_rsv = &root->fs_info->delayed_block_rsv;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_block_rsv *delayed_rsv = &fs_info->delayed_block_rsv;
        struct btrfs_trans_handle *trans;
 
        trans = (struct btrfs_trans_handle *)current->journal_info;
@@ -4855,6 +4875,7 @@ static int flush_space(struct btrfs_root *root,
                       struct btrfs_space_info *space_info, u64 num_bytes,
                       u64 orig_bytes, int state)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_trans_handle *trans;
        int nr;
        int ret = 0;
@@ -4886,7 +4907,7 @@ static int flush_space(struct btrfs_root *root,
                        ret = PTR_ERR(trans);
                        break;
                }
-               ret = do_chunk_alloc(trans, root->fs_info->extent_root,
+               ret = do_chunk_alloc(trans, fs_info->extent_root,
                                     btrfs_get_alloc_profile(root, 0),
                                     CHUNK_ALLOC_NO_FORCE);
                btrfs_end_transaction(trans, root);
@@ -4901,7 +4922,7 @@ static int flush_space(struct btrfs_root *root,
                break;
        }
 
-       trace_btrfs_flush_space(root->fs_info, space_info->flags, num_bytes,
+       trace_btrfs_flush_space(fs_info, space_info->flags, num_bytes,
                                orig_bytes, state, ret);
        return ret;
 }
@@ -4947,6 +4968,7 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_root *root,
 static inline int need_do_async_reclaim(struct btrfs_space_info *space_info,
                                        struct btrfs_root *root, u64 used)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 thresh = div_factor_fine(space_info->total_bytes, 98);
 
        /* If we're just plain full then async reclaim just slows us down. */
@@ -4956,9 +4978,8 @@ static inline int need_do_async_reclaim(struct btrfs_space_info *space_info,
        if (!btrfs_calc_reclaim_metadata_size(root, space_info))
                return 0;
 
-       return (used >= thresh && !btrfs_fs_closing(root->fs_info) &&
-               !test_bit(BTRFS_FS_STATE_REMOUNTING,
-                         &root->fs_info->fs_state));
+       return (used >= thresh && !btrfs_fs_closing(fs_info) &&
+               !test_bit(BTRFS_FS_STATE_REMOUNTING, &fs_info->fs_state));
 }
 
 static void wake_all_tickets(struct list_head *head)
@@ -5138,6 +5159,7 @@ static int __reserve_metadata_bytes(struct btrfs_root *root,
                                    u64 orig_bytes,
                                    enum btrfs_reserve_flush_enum flush)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct reserve_ticket ticket;
        u64 used;
        int ret = 0;
@@ -5158,15 +5180,13 @@ static int __reserve_metadata_bytes(struct btrfs_root *root,
         */
        if (used + orig_bytes <= space_info->total_bytes) {
                space_info->bytes_may_use += orig_bytes;
-               trace_btrfs_space_reservation(root->fs_info, "space_info",
-                                             space_info->flags, orig_bytes,
-                                             1);
+               trace_btrfs_space_reservation(fs_info, "space_info",
+                                             space_info->flags, orig_bytes, 1);
                ret = 0;
        } else if (can_overcommit(root, space_info, orig_bytes, flush)) {
                space_info->bytes_may_use += orig_bytes;
-               trace_btrfs_space_reservation(root->fs_info, "space_info",
-                                             space_info->flags, orig_bytes,
-                                             1);
+               trace_btrfs_space_reservation(fs_info, "space_info",
+                                             space_info->flags, orig_bytes, 1);
                ret = 0;
        }
 
@@ -5185,7 +5205,7 @@ static int __reserve_metadata_bytes(struct btrfs_root *root,
                        list_add_tail(&ticket.list, &space_info->tickets);
                        if (!space_info->flush) {
                                space_info->flush = 1;
-                               trace_btrfs_trigger_flush(root->fs_info,
+                               trace_btrfs_trigger_flush(fs_info,
                                                          space_info->flags,
                                                          orig_bytes, flush,
                                                          "enospc");
@@ -5203,15 +5223,13 @@ static int __reserve_metadata_bytes(struct btrfs_root *root,
                 * which means we won't have fs_info->fs_root set, so don't do
                 * the async reclaim as we will panic.
                 */
-               if (!test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags) &&
+               if (!test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags) &&
                    need_do_async_reclaim(space_info, root, used) &&
-                   !work_busy(&root->fs_info->async_reclaim_work)) {
-                       trace_btrfs_trigger_flush(root->fs_info,
-                                                 space_info->flags,
-                                                 orig_bytes, flush,
-                                                 "preempt");
+                   !work_busy(&fs_info->async_reclaim_work)) {
+                       trace_btrfs_trigger_flush(fs_info, space_info->flags,
+                                                 orig_bytes, flush, "preempt");
                        queue_work(system_unbound_wq,
-                                  &root->fs_info->async_reclaim_work);
+                                  &fs_info->async_reclaim_work);
                }
        }
        spin_unlock(&space_info->lock);
@@ -5219,19 +5237,19 @@ static int __reserve_metadata_bytes(struct btrfs_root *root,
                return ret;
 
        if (flush == BTRFS_RESERVE_FLUSH_ALL)
-               return wait_reserve_ticket(root->fs_info, space_info, &ticket,
+               return wait_reserve_ticket(fs_info, space_info, &ticket,
                                           orig_bytes);
 
        ret = 0;
-       priority_reclaim_metadata_space(root->fs_info, space_info, &ticket);
+       priority_reclaim_metadata_space(fs_info, space_info, &ticket);
        spin_lock(&space_info->lock);
        if (ticket.bytes) {
                if (ticket.bytes < orig_bytes) {
                        u64 num_bytes = orig_bytes - ticket.bytes;
                        space_info->bytes_may_use -= num_bytes;
-                       trace_btrfs_space_reservation(root->fs_info,
-                                       "space_info", space_info->flags,
-                                       num_bytes, 0);
+                       trace_btrfs_space_reservation(fs_info, "space_info",
+                                                     space_info->flags,
+                                                     num_bytes, 0);
 
                }
                list_del_init(&ticket.list);
@@ -5261,22 +5279,20 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
                                  u64 orig_bytes,
                                  enum btrfs_reserve_flush_enum flush)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
        int ret;
 
        ret = __reserve_metadata_bytes(root, block_rsv->space_info, orig_bytes,
                                       flush);
        if (ret == -ENOSPC &&
            unlikely(root->orphan_cleanup_state == ORPHAN_CLEANUP_STARTED)) {
-               struct btrfs_block_rsv *global_rsv =
-                       &root->fs_info->global_block_rsv;
-
                if (block_rsv != global_rsv &&
                    !block_rsv_use_bytes(global_rsv, orig_bytes))
                        ret = 0;
        }
        if (ret == -ENOSPC)
-               trace_btrfs_space_reservation(root->fs_info,
-                                             "space_info:enospc",
+               trace_btrfs_space_reservation(fs_info, "space_info:enospc",
                                              block_rsv->space_info->flags,
                                              orig_bytes, 1);
        return ret;
@@ -5286,18 +5302,19 @@ static struct btrfs_block_rsv *get_block_rsv(
                                        const struct btrfs_trans_handle *trans,
                                        const struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *block_rsv = NULL;
 
        if (test_bit(BTRFS_ROOT_REF_COWS, &root->state) ||
-           (root == root->fs_info->csum_root && trans->adding_csums) ||
-            (root == root->fs_info->uuid_root))
+           (root == fs_info->csum_root && trans->adding_csums) ||
+           (root == fs_info->uuid_root))
                block_rsv = trans->block_rsv;
 
        if (!block_rsv)
                block_rsv = root->block_rsv;
 
        if (!block_rsv)
-               block_rsv = &root->fs_info->empty_block_rsv;
+               block_rsv = &fs_info->empty_block_rsv;
 
        return block_rsv;
 }
@@ -5619,12 +5636,13 @@ void btrfs_block_rsv_release(struct btrfs_root *root,
                             struct btrfs_block_rsv *block_rsv,
                             u64 num_bytes)
 {
-       struct btrfs_block_rsv *global_rsv = &root->fs_info->global_block_rsv;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
+
        if (global_rsv == block_rsv ||
            block_rsv->space_info != global_rsv->space_info)
                global_rsv = NULL;
-       block_rsv_release_bytes(root->fs_info, block_rsv, global_rsv,
-                               num_bytes);
+       block_rsv_release_bytes(fs_info, block_rsv, global_rsv, num_bytes);
 }
 
 static void update_global_block_rsv(struct btrfs_fs_info *fs_info)
@@ -5721,13 +5739,15 @@ static void release_global_block_rsv(struct btrfs_fs_info *fs_info)
 void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
                                  struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        if (!trans->block_rsv)
                return;
 
        if (!trans->bytes_reserved)
                return;
 
-       trace_btrfs_space_reservation(root->fs_info, "transaction",
+       trace_btrfs_space_reservation(fs_info, "transaction",
                                      trans->transid, trans->bytes_reserved, 0);
        btrfs_block_rsv_release(root, trans->block_rsv, trans->bytes_reserved);
        trans->bytes_reserved = 0;
@@ -5755,6 +5775,7 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)
 int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
                                  struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        /*
         * We always use trans->block_rsv here as we will have reserved space
@@ -5770,17 +5791,20 @@ int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
         * added it, so this takes the reservation so we can release it later
         * when we are truly done with the orphan item.
         */
-       u64 num_bytes = btrfs_calc_trans_metadata_size(root->fs_info, 1);
-       trace_btrfs_space_reservation(root->fs_info, "orphan",
+       u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
+
+       trace_btrfs_space_reservation(fs_info, "orphan",
                                      btrfs_ino(inode), num_bytes, 1);
        return btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);
 }
 
 void btrfs_orphan_release_metadata(struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
-       u64 num_bytes = btrfs_calc_trans_metadata_size(root->fs_info, 1);
-       trace_btrfs_space_reservation(root->fs_info, "orphan",
+       u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
+
+       trace_btrfs_space_reservation(fs_info, "orphan",
                                      btrfs_ino(inode), num_bytes, 0);
        btrfs_block_rsv_release(root, root->orphan_block_rsv, num_bytes);
 }
@@ -5807,11 +5831,12 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
 {
        u64 num_bytes;
        int ret;
-       struct btrfs_block_rsv *global_rsv = &root->fs_info->global_block_rsv;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
 
-       if (test_bit(BTRFS_FS_QUOTA_ENABLED, &root->fs_info->flags)) {
+       if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) {
                /* One for parent inode, two for dir entries */
-               num_bytes = 3 * root->fs_info->nodesize;
+               num_bytes = 3 * fs_info->nodesize;
                ret = btrfs_qgroup_reserve_meta(root, num_bytes);
                if (ret)
                        return ret;
@@ -5821,8 +5846,8 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
 
        *qgroup_reserved = num_bytes;
 
-       num_bytes = btrfs_calc_trans_metadata_size(root->fs_info, items);
-       rsv->space_info = __find_space_info(root->fs_info,
+       num_bytes = btrfs_calc_trans_metadata_size(fs_info, items);
+       rsv->space_info = __find_space_info(fs_info,
                                            BTRFS_BLOCK_GROUP_METADATA);
        ret = btrfs_block_rsv_add(root, rsv, num_bytes,
                                  BTRFS_RESERVE_FLUSH_ALL);
@@ -5906,6 +5931,7 @@ static unsigned drop_outstanding_extent(struct inode *inode, u64 num_bytes)
 static u64 calc_csum_metadata_size(struct inode *inode, u64 num_bytes,
                                   int reserve)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        u64 old_csums, num_csums;
 
@@ -5925,17 +5951,17 @@ static u64 calc_csum_metadata_size(struct inode *inode, u64 num_bytes,
                return 0;
 
        if (reserve)
-               return btrfs_calc_trans_metadata_size(root->fs_info,
+               return btrfs_calc_trans_metadata_size(fs_info,
                                                      num_csums - old_csums);
 
-       return btrfs_calc_trans_metadata_size(root->fs_info,
-                                             old_csums - num_csums);
+       return btrfs_calc_trans_metadata_size(fs_info, old_csums - num_csums);
 }
 
 int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct btrfs_block_rsv *block_rsv = &root->fs_info->delalloc_block_rsv;
+       struct btrfs_block_rsv *block_rsv = &fs_info->delalloc_block_rsv;
        u64 to_reserve = 0;
        u64 csum_bytes;
        unsigned nr_extents = 0;
@@ -5962,13 +5988,13 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
        }
 
        if (flush != BTRFS_RESERVE_NO_FLUSH &&
-           btrfs_transaction_in_commit(root->fs_info))
+           btrfs_transaction_in_commit(fs_info))
                schedule_timeout(1);
 
        if (delalloc_lock)
                mutex_lock(&BTRFS_I(inode)->delalloc_mutex);
 
-       num_bytes = ALIGN(num_bytes, root->fs_info->sectorsize);
+       num_bytes = ALIGN(num_bytes, fs_info->sectorsize);
 
        spin_lock(&BTRFS_I(inode)->lock);
        nr_extents = (unsigned)div64_u64(num_bytes +
@@ -5983,15 +6009,14 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
                        BTRFS_I(inode)->reserved_extents;
 
        /* We always want to reserve a slot for updating the inode. */
-       to_reserve = btrfs_calc_trans_metadata_size(root->fs_info,
-                                                   nr_extents + 1);
+       to_reserve = btrfs_calc_trans_metadata_size(fs_info, nr_extents + 1);
        to_reserve += calc_csum_metadata_size(inode, num_bytes, 1);
        csum_bytes = BTRFS_I(inode)->csum_bytes;
        spin_unlock(&BTRFS_I(inode)->lock);
 
-       if (test_bit(BTRFS_FS_QUOTA_ENABLED, &root->fs_info->flags)) {
+       if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) {
                ret = btrfs_qgroup_reserve_meta(root,
-                               nr_extents * root->fs_info->nodesize);
+                               nr_extents * fs_info->nodesize);
                if (ret)
                        goto out_fail;
        }
@@ -5999,14 +6024,14 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
        ret = btrfs_block_rsv_add(root, block_rsv, to_reserve, flush);
        if (unlikely(ret)) {
                btrfs_qgroup_free_meta(root,
-                                      nr_extents * root->fs_info->nodesize);
+                                      nr_extents * fs_info->nodesize);
                goto out_fail;
        }
 
        spin_lock(&BTRFS_I(inode)->lock);
        if (test_and_set_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
                             &BTRFS_I(inode)->runtime_flags)) {
-               to_reserve -= btrfs_calc_trans_metadata_size(root->fs_info, 1);
+               to_reserve -= btrfs_calc_trans_metadata_size(fs_info, 1);
                release_extra = true;
        }
        BTRFS_I(inode)->reserved_extents += nr_extents;
@@ -6016,11 +6041,11 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
                mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
 
        if (to_reserve)
-               trace_btrfs_space_reservation(root->fs_info, "delalloc",
+               trace_btrfs_space_reservation(fs_info, "delalloc",
                                              btrfs_ino(inode), to_reserve, 1);
        if (release_extra)
                btrfs_block_rsv_release(root, block_rsv,
-                       btrfs_calc_trans_metadata_size(root->fs_info, 1));
+                               btrfs_calc_trans_metadata_size(fs_info, 1));
        return 0;
 
 out_fail:
@@ -6075,12 +6100,11 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
        }
        spin_unlock(&BTRFS_I(inode)->lock);
        if (dropped)
-               to_free += btrfs_calc_trans_metadata_size(root->fs_info,
-                                                         dropped);
+               to_free += btrfs_calc_trans_metadata_size(fs_info, dropped);
 
        if (to_free) {
                btrfs_block_rsv_release(root, block_rsv, to_free);
-               trace_btrfs_space_reservation(root->fs_info, "delalloc",
+               trace_btrfs_space_reservation(fs_info, "delalloc",
                                              btrfs_ino(inode), to_free, 0);
        }
        if (delalloc_lock)
@@ -6099,11 +6123,12 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
  */
 void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        u64 to_free = 0;
        unsigned dropped;
 
-       num_bytes = ALIGN(num_bytes, root->fs_info->sectorsize);
+       num_bytes = ALIGN(num_bytes, fs_info->sectorsize);
        spin_lock(&BTRFS_I(inode)->lock);
        dropped = drop_outstanding_extent(inode, num_bytes);
 
@@ -6111,17 +6136,15 @@ void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes)
                to_free = calc_csum_metadata_size(inode, num_bytes, 0);
        spin_unlock(&BTRFS_I(inode)->lock);
        if (dropped > 0)
-               to_free += btrfs_calc_trans_metadata_size(root->fs_info,
-                                                         dropped);
+               to_free += btrfs_calc_trans_metadata_size(fs_info, dropped);
 
-       if (btrfs_is_testing(root->fs_info))
+       if (btrfs_is_testing(fs_info))
                return;
 
-       trace_btrfs_space_reservation(root->fs_info, "delalloc",
+       trace_btrfs_space_reservation(fs_info, "delalloc",
                                      btrfs_ino(inode), to_free, 0);
 
-       btrfs_block_rsv_release(root, &root->fs_info->delalloc_block_rsv,
-                               to_free);
+       btrfs_block_rsv_release(root, &fs_info->delalloc_block_rsv, to_free);
 }
 
 /**
@@ -6251,7 +6274,7 @@ static int update_block_group(struct btrfs_trans_handle *trans,
                        spin_unlock(&cache->lock);
                        spin_unlock(&cache->space_info->lock);
 
-                       trace_btrfs_space_reservation(root->fs_info, "pinned",
+                       trace_btrfs_space_reservation(info, "pinned",
                                                      cache->space_info->flags,
                                                      num_bytes, 1);
                        set_extent_dirty(info->pinned_extents,
@@ -6293,17 +6316,18 @@ static int update_block_group(struct btrfs_trans_handle *trans,
 
 static u64 first_logical_byte(struct btrfs_root *root, u64 search_start)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
        u64 bytenr;
 
-       spin_lock(&root->fs_info->block_group_cache_lock);
-       bytenr = root->fs_info->first_logical_byte;
-       spin_unlock(&root->fs_info->block_group_cache_lock);
+       spin_lock(&fs_info->block_group_cache_lock);
+       bytenr = fs_info->first_logical_byte;
+       spin_unlock(&fs_info->block_group_cache_lock);
 
        if (bytenr < (u64)-1)
                return bytenr;
 
-       cache = btrfs_lookup_first_block_group(root->fs_info, search_start);
+       cache = btrfs_lookup_first_block_group(fs_info, search_start);
        if (!cache)
                return 0;
 
@@ -6317,6 +6341,8 @@ static int pin_down_extent(struct btrfs_root *root,
                           struct btrfs_block_group_cache *cache,
                           u64 bytenr, u64 num_bytes, int reserved)
 {
+       struct btrfs_fs_info *fs_info = cache->fs_info;
+
        spin_lock(&cache->space_info->lock);
        spin_lock(&cache->lock);
        cache->pinned += num_bytes;
@@ -6328,9 +6354,9 @@ static int pin_down_extent(struct btrfs_root *root,
        spin_unlock(&cache->lock);
        spin_unlock(&cache->space_info->lock);
 
-       trace_btrfs_space_reservation(root->fs_info, "pinned",
+       trace_btrfs_space_reservation(fs_info, "pinned",
                                      cache->space_info->flags, num_bytes, 1);
-       set_extent_dirty(root->fs_info->pinned_extents, bytenr,
+       set_extent_dirty(fs_info->pinned_extents, bytenr,
                         bytenr + num_bytes - 1, GFP_NOFS | __GFP_NOFAIL);
        return 0;
 }
@@ -6341,9 +6367,10 @@ static int pin_down_extent(struct btrfs_root *root,
 int btrfs_pin_extent(struct btrfs_root *root,
                     u64 bytenr, u64 num_bytes, int reserved)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
 
-       cache = btrfs_lookup_block_group(root->fs_info, bytenr);
+       cache = btrfs_lookup_block_group(fs_info, bytenr);
        BUG_ON(!cache); /* Logic error */
 
        pin_down_extent(root, cache, bytenr, num_bytes, reserved);
@@ -6358,10 +6385,11 @@ int btrfs_pin_extent(struct btrfs_root *root,
 int btrfs_pin_extent_for_log_replay(struct btrfs_root *root,
                                    u64 bytenr, u64 num_bytes)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
        int ret;
 
-       cache = btrfs_lookup_block_group(root->fs_info, bytenr);
+       cache = btrfs_lookup_block_group(fs_info, bytenr);
        if (!cache)
                return -EINVAL;
 
@@ -6383,11 +6411,12 @@ int btrfs_pin_extent_for_log_replay(struct btrfs_root *root,
 
 static int __exclude_logged_extent(struct btrfs_root *root, u64 start, u64 num_bytes)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        struct btrfs_block_group_cache *block_group;
        struct btrfs_caching_control *caching_ctl;
 
-       block_group = btrfs_lookup_block_group(root->fs_info, start);
+       block_group = btrfs_lookup_block_group(fs_info, start);
        if (!block_group)
                return -EINVAL;
 
@@ -6615,8 +6644,9 @@ static struct btrfs_free_cluster *
 fetch_cluster_info(struct btrfs_root *root, struct btrfs_space_info *space_info,
                   u64 *empty_cluster)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_free_cluster *ret = NULL;
-       bool ssd = btrfs_test_opt(root->fs_info, SSD);
+       bool ssd = btrfs_test_opt(fs_info, SSD);
 
        *empty_cluster = 0;
        if (btrfs_mixed_space_info(space_info))
@@ -6625,11 +6655,11 @@ fetch_cluster_info(struct btrfs_root *root, struct btrfs_space_info *space_info,
        if (ssd)
                *empty_cluster = SZ_2M;
        if (space_info->flags & BTRFS_BLOCK_GROUP_METADATA) {
-               ret = &root->fs_info->meta_alloc_cluster;
+               ret = &fs_info->meta_alloc_cluster;
                if (!ssd)
                        *empty_cluster = SZ_64K;
        } else if ((space_info->flags & BTRFS_BLOCK_GROUP_DATA) && ssd) {
-               ret = &root->fs_info->data_alloc_cluster;
+               ret = &fs_info->data_alloc_cluster;
        }
 
        return ret;
@@ -6761,7 +6791,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
                        break;
                }
 
-               if (btrfs_test_opt(root->fs_info, DISCARD))
+               if (btrfs_test_opt(fs_info, DISCARD))
                        ret = btrfs_discard_extent(root, start,
                                                   end + 1 - start, NULL);
 
@@ -6847,8 +6877,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
        u64 bytenr = node->bytenr;
        u64 num_bytes = node->num_bytes;
        int last_ref = 0;
-       bool skinny_metadata = btrfs_fs_incompat(root->fs_info,
-                                                SKINNY_METADATA);
+       bool skinny_metadata = btrfs_fs_incompat(info, SKINNY_METADATA);
 
        path = btrfs_alloc_path();
        if (!path)
@@ -7048,7 +7077,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
                                goto out;
                        }
                }
-               add_pinned_bytes(root->fs_info, -num_bytes, owner_objectid,
+               add_pinned_bytes(info, -num_bytes, owner_objectid,
                                 root_objectid);
        } else {
                if (found_extent) {
@@ -7080,15 +7109,13 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
                        }
                }
 
-               ret = add_to_free_space_tree(trans, root->fs_info, bytenr,
-                                            num_bytes);
+               ret = add_to_free_space_tree(trans, info, bytenr, num_bytes);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
                        goto out;
                }
 
-               ret = update_block_group(trans, root->fs_info, bytenr,
-                                        num_bytes, 0);
+               ret = update_block_group(trans, info, bytenr, num_bytes, 0);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
                        goto out;
@@ -7178,15 +7205,17 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
                           struct extent_buffer *buf,
                           u64 parent, int last_ref)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int pin = 1;
        int ret;
 
        if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {
-               ret = btrfs_add_delayed_tree_ref(root->fs_info, trans,
-                                       buf->start, buf->len,
-                                       parent, root->root_key.objectid,
-                                       btrfs_header_level(buf),
-                                       BTRFS_DROP_DELAYED_REF, NULL);
+               ret = btrfs_add_delayed_tree_ref(fs_info, trans,
+                                                buf->start, buf->len,
+                                                parent,
+                                                root->root_key.objectid,
+                                                btrfs_header_level(buf),
+                                                BTRFS_DROP_DELAYED_REF, NULL);
                BUG_ON(ret); /* -ENOMEM */
        }
 
@@ -7202,7 +7231,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
                                goto out;
                }
 
-               cache = btrfs_lookup_block_group(root->fs_info, buf->start);
+               cache = btrfs_lookup_block_group(fs_info, buf->start);
 
                if (btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) {
                        pin_down_extent(root, cache, buf->start, buf->len, 1);
@@ -7220,8 +7249,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
        }
 out:
        if (pin)
-               add_pinned_bytes(root->fs_info, buf->len,
-                                btrfs_header_level(buf),
+               add_pinned_bytes(fs_info, buf->len, btrfs_header_level(buf),
                                 root->root_key.objectid);
 
        /*
@@ -7242,7 +7270,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        if (btrfs_is_testing(fs_info))
                return 0;
 
-       add_pinned_bytes(root->fs_info, num_bytes, owner, root_objectid);
+       add_pinned_bytes(fs_info, num_bytes, owner, root_objectid);
 
        /*
         * tree log blocks never actually go into the extent allocation
@@ -7442,8 +7470,9 @@ static noinline int find_free_extent(struct btrfs_root *orig_root,
                                u64 hint_byte, struct btrfs_key *ins,
                                u64 flags, int delalloc)
 {
+       struct btrfs_fs_info *fs_info = orig_root->fs_info;
        int ret = 0;
-       struct btrfs_root *root = orig_root->fs_info->extent_root;
+       struct btrfs_root *root = fs_info->extent_root;
        struct btrfs_free_cluster *last_ptr = NULL;
        struct btrfs_block_group_cache *block_group = NULL;
        u64 search_start = 0;
@@ -7459,16 +7488,16 @@ static noinline int find_free_extent(struct btrfs_root *orig_root,
        bool orig_have_caching_bg = false;
        bool full_search = false;
 
-       WARN_ON(num_bytes < root->fs_info->sectorsize);
+       WARN_ON(num_bytes < fs_info->sectorsize);
        ins->type = BTRFS_EXTENT_ITEM_KEY;
        ins->objectid = 0;
        ins->offset = 0;
 
        trace_find_free_extent(orig_root, num_bytes, empty_size, flags);
 
-       space_info = __find_space_info(root->fs_info, flags);
+       space_info = __find_space_info(fs_info, flags);
        if (!space_info) {
-               btrfs_err(root->fs_info, "No space info for %llu", flags);
+               btrfs_err(fs_info, "No space info for %llu", flags);
                return -ENOSPC;
        }
 
@@ -7515,8 +7544,7 @@ static noinline int find_free_extent(struct btrfs_root *orig_root,
        search_start = max(search_start, first_logical_byte(root, 0));
        search_start = max(search_start, hint_byte);
        if (search_start == hint_byte) {
-               block_group = btrfs_lookup_block_group(root->fs_info,
-                                                      search_start);
+               block_group = btrfs_lookup_block_group(fs_info, search_start);
                /*
                 * we don't want to use the block group if it doesn't match our
                 * allocation bits, or if its not cached.
@@ -7769,7 +7797,7 @@ static noinline int find_free_extent(struct btrfs_root *orig_root,
                        goto loop;
                }
 checks:
-               search_start = ALIGN(offset, root->fs_info->stripesize);
+               search_start = ALIGN(offset, fs_info->stripesize);
 
                /* move on to the next group */
                if (search_start + num_bytes >
@@ -7968,7 +7996,7 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,
 
        flags = btrfs_get_alloc_profile(root, is_data);
 again:
-       WARN_ON(num_bytes < root->fs_info->sectorsize);
+       WARN_ON(num_bytes < fs_info->sectorsize);
        ret = find_free_extent(root, ram_bytes, num_bytes, empty_size,
                               hint_byte, ins, flags, delalloc);
        if (!ret && !is_data) {
@@ -7977,7 +8005,7 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,
                if (!final_tried && ins->offset) {
                        num_bytes = min(num_bytes >> 1, ins->offset);
                        num_bytes = round_down(num_bytes,
-                                              root->fs_info->sectorsize);
+                                              fs_info->sectorsize);
                        num_bytes = max(num_bytes, min_alloc_size);
                        ram_bytes = num_bytes;
                        if (num_bytes == min_alloc_size)
@@ -7987,7 +8015,7 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,
                        struct btrfs_space_info *sinfo;
 
                        sinfo = __find_space_info(fs_info, flags);
-                       btrfs_err(root->fs_info,
+                       btrfs_err(fs_info,
                                  "allocation failed flags %llu, wanted %llu",
                                  flags, num_bytes);
                        if (sinfo)
@@ -8002,20 +8030,21 @@ static int __btrfs_free_reserved_extent(struct btrfs_root *root,
                                        u64 start, u64 len,
                                        int pin, int delalloc)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
        int ret = 0;
 
-       cache = btrfs_lookup_block_group(root->fs_info, start);
+       cache = btrfs_lookup_block_group(fs_info, start);
        if (!cache) {
-               btrfs_err(root->fs_info, "Unable to find block group for %llu",
-                       start);
+               btrfs_err(fs_info, "Unable to find block group for %llu",
+                         start);
                return -ENOSPC;
        }
 
        if (pin)
                pin_down_extent(root, cache, start, len, 1);
        else {
-               if (btrfs_test_opt(root->fs_info, DISCARD))
+               if (btrfs_test_opt(fs_info, DISCARD))
                        ret = btrfs_discard_extent(root, start, len, NULL);
                btrfs_add_free_space(cache, start, len);
                btrfs_free_reserved_bytes(cache, len, delalloc);
@@ -8130,8 +8159,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
        struct extent_buffer *leaf;
        u32 size = sizeof(*extent_item) + sizeof(*iref);
        u64 num_bytes = ins->offset;
-       bool skinny_metadata = btrfs_fs_incompat(root->fs_info,
-                                                SKINNY_METADATA);
+       bool skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
 
        if (!skinny_metadata)
                size += sizeof(*block_info);
@@ -8139,7 +8167,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
        path = btrfs_alloc_path();
        if (!path) {
                btrfs_free_and_pin_reserved_extent(root, ins->objectid,
-                                                  root->fs_info->nodesize);
+                                                  fs_info->nodesize);
                return -ENOMEM;
        }
 
@@ -8149,7 +8177,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
        if (ret) {
                btrfs_free_path(path);
                btrfs_free_and_pin_reserved_extent(root, ins->objectid,
-                                                  root->fs_info->nodesize);
+                                                  fs_info->nodesize);
                return ret;
        }
 
@@ -8163,7 +8191,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
 
        if (skinny_metadata) {
                iref = (struct btrfs_extent_inline_ref *)(extent_item + 1);
-               num_bytes = root->fs_info->nodesize;
+               num_bytes = fs_info->nodesize;
        } else {
                block_info = (struct btrfs_tree_block_info *)(extent_item + 1);
                btrfs_set_tree_block_key(leaf, block_info, key);
@@ -8199,7 +8227,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
        }
 
        trace_btrfs_reserved_extent_alloc(root, ins->objectid,
-                                         root->fs_info->nodesize);
+                                         fs_info->nodesize);
        return ret;
 }
 
@@ -8209,11 +8237,12 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
                                     u64 offset, u64 ram_bytes,
                                     struct btrfs_key *ins)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
 
        BUG_ON(root_objectid == BTRFS_TREE_LOG_OBJECTID);
 
-       ret = btrfs_add_delayed_data_ref(root->fs_info, trans, ins->objectid,
+       ret = btrfs_add_delayed_data_ref(fs_info, trans, ins->objectid,
                                         ins->offset, 0,
                                         root_objectid, owner, offset,
                                         ram_bytes, BTRFS_ADD_DELAYED_EXTENT,
@@ -8231,6 +8260,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,
                                   u64 root_objectid, u64 owner, u64 offset,
                                   struct btrfs_key *ins)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        struct btrfs_block_group_cache *block_group;
        struct btrfs_space_info *space_info;
@@ -8239,13 +8269,13 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,
         * Mixed block groups will exclude before processing the log so we only
         * need to do the exclude dance if this fs isn't mixed.
         */
-       if (!btrfs_fs_incompat(root->fs_info, MIXED_GROUPS)) {
+       if (!btrfs_fs_incompat(fs_info, MIXED_GROUPS)) {
                ret = __exclude_logged_extent(root, ins->objectid, ins->offset);
                if (ret)
                        return ret;
        }
 
-       block_group = btrfs_lookup_block_group(root->fs_info, ins->objectid);
+       block_group = btrfs_lookup_block_group(fs_info, ins->objectid);
        if (!block_group)
                return -EINVAL;
 
@@ -8267,6 +8297,7 @@ static struct extent_buffer *
 btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                      u64 bytenr, int level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *buf;
 
        buf = btrfs_find_create_tree_block(root, bytenr);
@@ -8276,7 +8307,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        btrfs_set_header_generation(buf, trans->transid);
        btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level);
        btrfs_tree_lock(buf);
-       clean_tree_block(trans, root->fs_info, buf);
+       clean_tree_block(trans, fs_info, buf);
        clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);
 
        btrfs_set_lock_blocking(buf);
@@ -8308,8 +8339,9 @@ static struct btrfs_block_rsv *
 use_block_rsv(struct btrfs_trans_handle *trans,
              struct btrfs_root *root, u32 blocksize)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *block_rsv;
-       struct btrfs_block_rsv *global_rsv = &root->fs_info->global_block_rsv;
+       struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
        int ret;
        bool global_updated = false;
 
@@ -8327,11 +8359,11 @@ use_block_rsv(struct btrfs_trans_handle *trans,
 
        if (block_rsv->type == BTRFS_BLOCK_RSV_GLOBAL && !global_updated) {
                global_updated = true;
-               update_global_block_rsv(root->fs_info);
+               update_global_block_rsv(fs_info);
                goto again;
        }
 
-       if (btrfs_test_opt(root->fs_info, ENOSPC_DEBUG)) {
+       if (btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
                static DEFINE_RATELIMIT_STATE(_rs,
                                DEFAULT_RATELIMIT_INTERVAL * 10,
                                /*DEFAULT_RATELIMIT_BURST*/ 1);
@@ -8375,18 +8407,18 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
                                        struct btrfs_disk_key *key, int level,
                                        u64 hint, u64 empty_size)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key ins;
        struct btrfs_block_rsv *block_rsv;
        struct extent_buffer *buf;
        struct btrfs_delayed_extent_op *extent_op;
        u64 flags = 0;
        int ret;
-       u32 blocksize = root->fs_info->nodesize;
-       bool skinny_metadata = btrfs_fs_incompat(root->fs_info,
-                                                SKINNY_METADATA);
+       u32 blocksize = fs_info->nodesize;
+       bool skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
 
 #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
-       if (btrfs_is_testing(root->fs_info)) {
+       if (btrfs_is_testing(fs_info)) {
                buf = btrfs_init_new_buffer(trans, root, root->alloc_bytenr,
                                            level);
                if (!IS_ERR(buf))
@@ -8433,7 +8465,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
                extent_op->is_data = false;
                extent_op->level = level;
 
-               ret = btrfs_add_delayed_tree_ref(root->fs_info, trans,
+               ret = btrfs_add_delayed_tree_ref(fs_info, trans,
                                                 ins.objectid, ins.offset,
                                                 parent, root_objectid, level,
                                                 BTRFS_ADD_DELAYED_EXTENT,
@@ -8450,7 +8482,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
 out_free_reserved:
        btrfs_free_reserved_extent(root, ins.objectid, ins.offset, 0);
 out_unuse:
-       unuse_block_rsv(root->fs_info, block_rsv, blocksize);
+       unuse_block_rsv(fs_info, block_rsv, blocksize);
        return ERR_PTR(ret);
 }
 
@@ -8476,6 +8508,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans,
                                     struct walk_control *wc,
                                     struct btrfs_path *path)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 bytenr;
        u64 generation;
        u64 refs;
@@ -8493,7 +8526,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans,
        } else {
                wc->reada_count = wc->reada_count * 3 / 2;
                wc->reada_count = min_t(int, wc->reada_count,
-                                       BTRFS_NODEPTRS_PER_BLOCK(root->fs_info));
+                                       BTRFS_NODEPTRS_PER_BLOCK(fs_info));
        }
 
        eb = path->nodes[wc->level];
@@ -8644,6 +8677,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
                                 struct btrfs_path *path,
                                 struct walk_control *wc, int *lookup_info)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 bytenr;
        u64 generation;
        u64 parent;
@@ -8669,9 +8703,9 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
        }
 
        bytenr = btrfs_node_blockptr(path->nodes[level], path->slots[level]);
-       blocksize = root->fs_info->nodesize;
+       blocksize = fs_info->nodesize;
 
-       next = find_extent_buffer(root->fs_info, bytenr);
+       next = find_extent_buffer(fs_info, bytenr);
        if (!next) {
                next = btrfs_find_create_tree_block(root, bytenr);
                if (IS_ERR(next))
@@ -8691,7 +8725,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
                goto out_unlock;
 
        if (unlikely(wc->refs[level - 1] == 0)) {
-               btrfs_err(root->fs_info, "Missing references.");
+               btrfs_err(fs_info, "Missing references.");
                ret = -EIO;
                goto out_unlock;
        }
@@ -8781,7 +8815,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
                        ret = btrfs_qgroup_trace_subtree(trans, root, next,
                                                         generation, level - 1);
                        if (ret) {
-                               btrfs_err_rl(root->fs_info,
+                               btrfs_err_rl(fs_info,
                                             "Error %d accounting shared subtree. Quota is out of sync, rescan required.",
                                             ret);
                        }
@@ -8819,6 +8853,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
                                 struct btrfs_path *path,
                                 struct walk_control *wc)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        int level = wc->level;
        struct extent_buffer *eb = path->nodes[level];
@@ -8878,7 +8913,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
                        BUG_ON(ret); /* -ENOMEM */
                        ret = btrfs_qgroup_trace_leaf_items(trans, root, eb);
                        if (ret) {
-                               btrfs_err_rl(root->fs_info,
+                               btrfs_err_rl(fs_info,
                                             "error %d accounting leaf items. Quota is out of sync, rescan required.",
                                             ret);
                        }
@@ -8890,7 +8925,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
                        btrfs_set_lock_blocking(eb);
                        path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
                }
-               clean_tree_block(trans, root->fs_info, eb);
+               clean_tree_block(trans, fs_info, eb);
        }
 
        if (eb == root->node) {
@@ -9094,7 +9129,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
        wc->update_ref = update_ref;
        wc->keep_locks = 0;
        wc->for_reloc = for_reloc;
-       wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(root->fs_info);
+       wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(fs_info);
 
        while (1) {
 
@@ -9219,6 +9254,7 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans,
                        struct extent_buffer *node,
                        struct extent_buffer *parent)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct walk_control *wc;
        int level;
@@ -9258,7 +9294,7 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans,
        wc->update_ref = 0;
        wc->keep_locks = 1;
        wc->for_reloc = 1;
-       wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(root->fs_info);
+       wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(fs_info);
 
        while (1) {
                wret = walk_down_tree(trans, root, path, wc);
@@ -9377,6 +9413,7 @@ int btrfs_inc_block_group_ro(struct btrfs_root *root,
                             struct btrfs_block_group_cache *cache)
 
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_trans_handle *trans;
        u64 alloc_flags;
        int ret;
@@ -9391,11 +9428,11 @@ int btrfs_inc_block_group_ro(struct btrfs_root *root,
         * block groups cache has started writing.  If it already started,
         * back off and let this transaction commit
         */
-       mutex_lock(&root->fs_info->ro_block_group_mutex);
+       mutex_lock(&fs_info->ro_block_group_mutex);
        if (test_bit(BTRFS_TRANS_DIRTY_BG_RUN, &trans->transaction->flags)) {
                u64 transid = trans->transid;
 
-               mutex_unlock(&root->fs_info->ro_block_group_mutex);
+               mutex_unlock(&fs_info->ro_block_group_mutex);
                btrfs_end_transaction(trans, root);
 
                ret = btrfs_wait_for_commit(root, transid);
@@ -9408,7 +9445,7 @@ int btrfs_inc_block_group_ro(struct btrfs_root *root,
         * if we are changing raid levels, try to allocate a corresponding
         * block group with the new raid level.
         */
-       alloc_flags = update_block_group_flags(root->fs_info, cache->flags);
+       alloc_flags = update_block_group_flags(fs_info, cache->flags);
        if (alloc_flags != cache->flags) {
                ret = do_chunk_alloc(trans, root, alloc_flags,
                                     CHUNK_ALLOC_FORCE);
@@ -9434,13 +9471,12 @@ int btrfs_inc_block_group_ro(struct btrfs_root *root,
        ret = inc_block_group_ro(cache, 0);
 out:
        if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) {
-               alloc_flags = update_block_group_flags(root->fs_info,
-                                                      cache->flags);
-               lock_chunks(root->fs_info);
+               alloc_flags = update_block_group_flags(fs_info, cache->flags);
+               lock_chunks(fs_info);
                check_system_chunk(trans, root, alloc_flags);
-               unlock_chunks(root->fs_info);
+               unlock_chunks(fs_info);
        }
-       mutex_unlock(&root->fs_info->ro_block_group_mutex);
+       mutex_unlock(&fs_info->ro_block_group_mutex);
 
        btrfs_end_transaction(trans, root);
        return ret;
@@ -9527,7 +9563,7 @@ int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr)
        struct btrfs_root *root = fs_info->extent_root;
        struct btrfs_block_group_cache *block_group;
        struct btrfs_space_info *space_info;
-       struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        struct btrfs_device *device;
        struct btrfs_trans_handle *trans;
        u64 min_free;
@@ -9539,14 +9575,14 @@ int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr)
        int full = 0;
        int ret = 0;
 
-       debug = btrfs_test_opt(root->fs_info, ENOSPC_DEBUG);
+       debug = btrfs_test_opt(fs_info, ENOSPC_DEBUG);
 
-       block_group = btrfs_lookup_block_group(root->fs_info, bytenr);
+       block_group = btrfs_lookup_block_group(fs_info, bytenr);
 
        /* odd, couldn't find the block group, leave it alone */
        if (!block_group) {
                if (debug)
-                       btrfs_warn(root->fs_info,
+                       btrfs_warn(fs_info,
                                   "can't find block group for bytenr %llu",
                                   bytenr);
                return -1;
@@ -9596,7 +9632,7 @@ int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr)
         *      3: raid0
         *      4: single
         */
-       target = get_restripe_target(root->fs_info, block_group->flags);
+       target = get_restripe_target(fs_info, block_group->flags);
        if (target) {
                index = __get_raid_index(extended_to_chunk(target));
        } else {
@@ -9606,9 +9642,9 @@ int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr)
                 */
                if (full) {
                        if (debug)
-                               btrfs_warn(root->fs_info,
-                                       "no space to alloc new chunk for block group %llu",
-                                       block_group->key.objectid);
+                               btrfs_warn(fs_info,
+                                          "no space to alloc new chunk for block group %llu",
+                                          block_group->key.objectid);
                        goto out;
                }
 
@@ -9636,7 +9672,7 @@ int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr)
                goto out;
        }
 
-       mutex_lock(&root->fs_info->chunk_mutex);
+       mutex_lock(&fs_info->chunk_mutex);
        list_for_each_entry(device, &fs_devices->alloc_list, dev_alloc_list) {
                u64 dev_offset;
 
@@ -9658,10 +9694,10 @@ int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr)
                }
        }
        if (debug && ret == -1)
-               btrfs_warn(root->fs_info,
-                       "no space to allocate a new chunk for block group %llu",
-                       block_group->key.objectid);
-       mutex_unlock(&root->fs_info->chunk_mutex);
+               btrfs_warn(fs_info,
+                          "no space to allocate a new chunk for block group %llu",
+                          block_group->key.objectid);
+       mutex_unlock(&fs_info->chunk_mutex);
        btrfs_end_transaction(trans, root);
 out:
        btrfs_put_block_group(block_group);
@@ -9706,7 +9742,7 @@ static int find_first_block_group(struct btrfs_fs_info *fs_info,
                                                   found_key.offset);
                        read_unlock(&em_tree->lock);
                        if (!em) {
-                               btrfs_err(root->fs_info,
+                               btrfs_err(fs_info,
                        "logical %llu len %llu found bg but no related chunk",
                                          found_key.objectid, found_key.offset);
                                ret = -ENOENT;
@@ -9898,6 +9934,7 @@ static void __link_block_group(struct btrfs_space_info *space_info,
 static struct btrfs_block_group_cache *
 btrfs_create_block_group_cache(struct btrfs_root *root, u64 start, u64 size)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
 
        cache = kzalloc(sizeof(*cache), GFP_NOFS);
@@ -9915,11 +9952,10 @@ btrfs_create_block_group_cache(struct btrfs_root *root, u64 start, u64 size)
        cache->key.offset = size;
        cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
 
-       cache->sectorsize = root->fs_info->sectorsize;
-       cache->fs_info = root->fs_info;
+       cache->sectorsize = fs_info->sectorsize;
+       cache->fs_info = fs_info;
        cache->full_stripe_len = btrfs_full_stripe_len(root,
-                                              &root->fs_info->mapping_tree,
-                                              start);
+                                              &fs_info->mapping_tree, start);
        set_free_space_tree_thresholds(cache);
 
        atomic_set(&cache->count, 1);
@@ -9964,11 +10000,11 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
                return -ENOMEM;
        path->reada = READA_FORWARD;
 
-       cache_gen = btrfs_super_cache_generation(root->fs_info->super_copy);
-       if (btrfs_test_opt(root->fs_info, SPACE_CACHE) &&
-           btrfs_super_generation(root->fs_info->super_copy) != cache_gen)
+       cache_gen = btrfs_super_cache_generation(info->super_copy);
+       if (btrfs_test_opt(info, SPACE_CACHE) &&
+           btrfs_super_generation(info->super_copy) != cache_gen)
                need_clear = 1;
-       if (btrfs_test_opt(root->fs_info, CLEAR_CACHE))
+       if (btrfs_test_opt(info, CLEAR_CACHE))
                need_clear = 1;
 
        while (1) {
@@ -9999,7 +10035,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
                         * b) Setting 'dirty flag' makes sure that we flush
                         *    the new space cache info onto disk.
                         */
-                       if (btrfs_test_opt(root->fs_info, SPACE_CACHE))
+                       if (btrfs_test_opt(info, SPACE_CACHE))
                                cache->disk_cache_state = BTRFS_DC_CLEAR;
                }
 
@@ -10050,21 +10086,21 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
                } else if (btrfs_block_group_used(&cache->item) == 0) {
                        cache->last_byte_to_unpin = (u64)-1;
                        cache->cached = BTRFS_CACHE_FINISHED;
-                       add_new_free_space(cache, root->fs_info,
+                       add_new_free_space(cache, info,
                                           found_key.objectid,
                                           found_key.objectid +
                                           found_key.offset);
                        free_excluded_extents(root, cache);
                }
 
-               ret = btrfs_add_block_group_cache(root->fs_info, cache);
+               ret = btrfs_add_block_group_cache(info, cache);
                if (ret) {
                        btrfs_remove_free_space_cache(cache);
                        btrfs_put_block_group(cache);
                        goto error;
                }
 
-               trace_btrfs_add_block_group(root->fs_info, cache, 0);
+               trace_btrfs_add_block_group(info, cache, 0);
                ret = update_space_info(info, cache->flags, found_key.offset,
                                        btrfs_block_group_used(&cache->item),
                                        cache->bytes_super, &space_info);
@@ -10083,7 +10119,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
 
                __link_block_group(space_info, cache);
 
-               set_avail_alloc_bits(root->fs_info, cache->flags);
+               set_avail_alloc_bits(info, cache->flags);
                if (btrfs_chunk_readonly(root, cache->key.objectid)) {
                        inc_block_group_ro(cache, 1);
                } else if (btrfs_block_group_used(&cache->item) == 0) {
@@ -10098,7 +10134,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
                }
        }
 
-       list_for_each_entry_rcu(space_info, &root->fs_info->space_info, list) {
+       list_for_each_entry_rcu(space_info, &info->space_info, list) {
                if (!(get_alloc_profile(root, space_info->flags) &
                      (BTRFS_BLOCK_GROUP_RAID10 |
                       BTRFS_BLOCK_GROUP_RAID1 |
@@ -10130,8 +10166,9 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
 void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans,
                                       struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *block_group, *tmp;
-       struct btrfs_root *extent_root = root->fs_info->extent_root;
+       struct btrfs_root *extent_root = fs_info->extent_root;
        struct btrfs_block_group_item item;
        struct btrfs_key key;
        int ret = 0;
@@ -10151,11 +10188,11 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans,
                                        sizeof(item));
                if (ret)
                        btrfs_abort_transaction(trans, ret);
-               ret = btrfs_finish_chunk_alloc(trans, extent_root->fs_info,
-                                              key.objectid, key.offset);
+               ret = btrfs_finish_chunk_alloc(trans, fs_info, key.objectid,
+                                              key.offset);
                if (ret)
                        btrfs_abort_transaction(trans, ret);
-               add_block_group_free_space(trans, root->fs_info, block_group);
+               add_block_group_free_space(trans, fs_info, block_group);
                /* already aborted the transaction if it failed. */
 next:
                list_del_init(&block_group->bg_list);
@@ -10168,12 +10205,11 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                           u64 type, u64 chunk_objectid, u64 chunk_offset,
                           u64 size)
 {
-       int ret;
-       struct btrfs_root *extent_root;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
-       extent_root = root->fs_info->extent_root;
+       int ret;
 
-       btrfs_set_log_full_commit(root->fs_info, trans);
+       btrfs_set_log_full_commit(fs_info, trans);
 
        cache = btrfs_create_block_group_cache(root, chunk_offset, size);
        if (!cache)
@@ -10198,8 +10234,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                return ret;
        }
 
-       add_new_free_space(cache, root->fs_info, chunk_offset,
-                          chunk_offset + size);
+       add_new_free_space(cache, fs_info, chunk_offset, chunk_offset + size);
 
        free_excluded_extents(root, cache);
 
@@ -10216,7 +10251,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
         * assigned to our block group, but don't update its counters just yet.
         * We want our bg to be added to the rbtree with its ->space_info set.
         */
-       ret = update_space_info(root->fs_info, cache->flags, 0, 0, 0,
+       ret = update_space_info(fs_info, cache->flags, 0, 0, 0,
                                &cache->space_info);
        if (ret) {
                btrfs_remove_free_space_cache(cache);
@@ -10224,7 +10259,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                return ret;
        }
 
-       ret = btrfs_add_block_group_cache(root->fs_info, cache);
+       ret = btrfs_add_block_group_cache(fs_info, cache);
        if (ret) {
                btrfs_remove_free_space_cache(cache);
                btrfs_put_block_group(cache);
@@ -10235,26 +10270,26 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
         * Now that our block group has its ->space_info set and is inserted in
         * the rbtree, update the space info's counters.
         */
-       trace_btrfs_add_block_group(root->fs_info, cache, 1);
-       ret = update_space_info(root->fs_info, cache->flags, size, bytes_used,
+       trace_btrfs_add_block_group(fs_info, cache, 1);
+       ret = update_space_info(fs_info, cache->flags, size, bytes_used,
                                cache->bytes_super, &cache->space_info);
        if (ret) {
                btrfs_remove_free_space_cache(cache);
-               spin_lock(&root->fs_info->block_group_cache_lock);
+               spin_lock(&fs_info->block_group_cache_lock);
                rb_erase(&cache->cache_node,
-                        &root->fs_info->block_group_cache_tree);
+                        &fs_info->block_group_cache_tree);
                RB_CLEAR_NODE(&cache->cache_node);
-               spin_unlock(&root->fs_info->block_group_cache_lock);
+               spin_unlock(&fs_info->block_group_cache_lock);
                btrfs_put_block_group(cache);
                return ret;
        }
-       update_global_block_rsv(root->fs_info);
+       update_global_block_rsv(fs_info);
 
        __link_block_group(cache->space_info, cache);
 
        list_add_tail(&cache->bg_list, &trans->new_bgs);
 
-       set_avail_alloc_bits(extent_root->fs_info, type);
+       set_avail_alloc_bits(fs_info, type);
        return 0;
 }
 
@@ -10281,7 +10316,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
        struct btrfs_path *path;
        struct btrfs_block_group_cache *block_group;
        struct btrfs_free_cluster *cluster;
-       struct btrfs_root *tree_root = root->fs_info->tree_root;
+       struct btrfs_root *tree_root = fs_info->tree_root;
        struct btrfs_key key;
        struct inode *inode;
        struct kobject *kobj = NULL;
@@ -10311,7 +10346,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
                factor = 1;
 
        /* make sure this block group isn't part of an allocation cluster */
-       cluster = &root->fs_info->data_alloc_cluster;
+       cluster = &fs_info->data_alloc_cluster;
        spin_lock(&cluster->refill_lock);
        btrfs_return_cluster_to_free_space(block_group, cluster);
        spin_unlock(&cluster->refill_lock);
@@ -10320,7 +10355,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
         * make sure this block group isn't part of a metadata
         * allocation cluster
         */
-       cluster = &root->fs_info->meta_alloc_cluster;
+       cluster = &fs_info->meta_alloc_cluster;
        spin_lock(&cluster->refill_lock);
        btrfs_return_cluster_to_free_space(block_group, cluster);
        spin_unlock(&cluster->refill_lock);
@@ -10400,14 +10435,14 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
                btrfs_release_path(path);
        }
 
-       spin_lock(&root->fs_info->block_group_cache_lock);
+       spin_lock(&fs_info->block_group_cache_lock);
        rb_erase(&block_group->cache_node,
-                &root->fs_info->block_group_cache_tree);
+                &fs_info->block_group_cache_tree);
        RB_CLEAR_NODE(&block_group->cache_node);
 
-       if (root->fs_info->first_logical_byte == block_group->key.objectid)
-               root->fs_info->first_logical_byte = (u64)-1;
-       spin_unlock(&root->fs_info->block_group_cache_lock);
+       if (fs_info->first_logical_byte == block_group->key.objectid)
+               fs_info->first_logical_byte = (u64)-1;
+       spin_unlock(&fs_info->block_group_cache_lock);
 
        down_write(&block_group->space_info->groups_sem);
        /*
@@ -10418,7 +10453,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
        if (list_empty(&block_group->space_info->block_groups[index])) {
                kobj = block_group->space_info->block_group_kobjs[index];
                block_group->space_info->block_group_kobjs[index] = NULL;
-               clear_avail_alloc_bits(root->fs_info, block_group->flags);
+               clear_avail_alloc_bits(fs_info, block_group->flags);
        }
        up_write(&block_group->space_info->groups_sem);
        if (kobj) {
@@ -10431,12 +10466,12 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
        if (block_group->cached == BTRFS_CACHE_STARTED)
                wait_block_group_cache_done(block_group);
        if (block_group->has_caching_ctl) {
-               down_write(&root->fs_info->commit_root_sem);
+               down_write(&fs_info->commit_root_sem);
                if (!caching_ctl) {
                        struct btrfs_caching_control *ctl;
 
                        list_for_each_entry(ctl,
-                                   &root->fs_info->caching_block_groups, list)
+                                   &fs_info->caching_block_groups, list)
                                if (ctl->block_group == block_group) {
                                        caching_ctl = ctl;
                                        atomic_inc(&caching_ctl->count);
@@ -10445,7 +10480,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
                }
                if (caching_ctl)
                        list_del_init(&caching_ctl->list);
-               up_write(&root->fs_info->commit_root_sem);
+               up_write(&fs_info->commit_root_sem);
                if (caching_ctl) {
                        /* Once for the caching bgs list and once for us. */
                        put_caching_control(caching_ctl);
@@ -10466,7 +10501,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
        spin_lock(&block_group->space_info->lock);
        list_del_init(&block_group->ro_list);
 
-       if (btrfs_test_opt(root->fs_info, ENOSPC_DEBUG)) {
+       if (btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
                WARN_ON(block_group->space_info->total_bytes
                        < block_group->key.offset);
                WARN_ON(block_group->space_info->bytes_readonly
@@ -10482,7 +10517,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
 
        memcpy(&key, &block_group->key, sizeof(key));
 
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
        if (!list_empty(&em->list)) {
                /* We're in the transaction->pending_chunks list. */
                free_extent_map(em);
@@ -10530,14 +10565,14 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
                 * sees the em, either in the pending_chunks list or in the
                 * pinned_chunks list.
                 */
-               list_move_tail(&em->list, &root->fs_info->pinned_chunks);
+               list_move_tail(&em->list, &fs_info->pinned_chunks);
        }
        spin_unlock(&block_group->lock);
 
        if (remove_em) {
                struct extent_map_tree *em_tree;
 
-               em_tree = &root->fs_info->mapping_tree.map_tree;
+               em_tree = &fs_info->mapping_tree.map_tree;
                write_lock(&em_tree->lock);
                /*
                 * The em might be in the pending_chunks list, so make sure the
@@ -10550,9 +10585,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
                free_extent_map(em);
        }
 
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
 
-       ret = remove_block_group_free_space(trans, root->fs_info, block_group);
+       ret = remove_block_group_free_space(trans, fs_info, block_group);
        if (ret)
                goto out;
 
@@ -10734,7 +10769,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
                spin_unlock(&space_info->lock);
 
                /* DISCARD can flip during remount */
-               trimming = btrfs_test_opt(root->fs_info, DISCARD);
+               trimming = btrfs_test_opt(fs_info, DISCARD);
 
                /* Implicit trim during transaction commit. */
                if (trimming)
@@ -10970,8 +11005,8 @@ int btrfs_trim_fs(struct btrfs_root *root, struct fstrim_range *range)
                cache = next_block_group(fs_info->tree_root, cache);
        }
 
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
-       devices = &root->fs_info->fs_devices->alloc_list;
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
+       devices = &fs_info->fs_devices->alloc_list;
        list_for_each_entry(device, devices, dev_alloc_list) {
                ret = btrfs_trim_free_extents(device, range->minlen,
                                              &group_trimmed);
@@ -10980,7 +11015,7 @@ int btrfs_trim_fs(struct btrfs_root *root, struct fstrim_range *range)
 
                trimmed += group_trimmed;
        }
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
        range->len = trimmed;
        return ret;
index 3747af693e78a771bd7a042667fe59963b9353e2..8df72ded901838ab6ea5faccdc4a0049117093d9 100644 (file)
@@ -2070,17 +2070,18 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical,
 int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer *eb,
                         int mirror_num)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 start = eb->start;
        unsigned long i, num_pages = num_extent_pages(eb->start, eb->len);
        int ret = 0;
 
-       if (root->fs_info->sb->s_flags & MS_RDONLY)
+       if (fs_info->sb->s_flags & MS_RDONLY)
                return -EROFS;
 
        for (i = 0; i < num_pages; i++) {
                struct page *p = eb->pages[i];
 
-               ret = repair_io_failure(root->fs_info->btree_inode, start,
+               ret = repair_io_failure(fs_info->btree_inode, start,
                                        PAGE_SIZE, start, p,
                                        start - page_offset(p), mirror_num);
                if (ret)
@@ -2341,6 +2342,7 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,
                                    struct page *page, int pg_offset, int icsum,
                                    bio_end_io_t *endio_func, void *data)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct bio *bio;
        struct btrfs_io_bio *btrfs_failed_bio;
        struct btrfs_io_bio *btrfs_bio;
@@ -2351,13 +2353,12 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,
 
        bio->bi_end_io = endio_func;
        bio->bi_iter.bi_sector = failrec->logical >> 9;
-       bio->bi_bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
+       bio->bi_bdev = fs_info->fs_devices->latest_bdev;
        bio->bi_iter.bi_size = 0;
        bio->bi_private = data;
 
        btrfs_failed_bio = btrfs_io_bio(failed_bio);
        if (btrfs_failed_bio->csum) {
-               struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;
                u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
 
                btrfs_bio = btrfs_io_bio(bio);
@@ -2476,6 +2477,8 @@ static void end_bio_extent_writepage(struct bio *bio)
 
        bio_for_each_segment_all(bvec, bio, i) {
                struct page *page = bvec->bv_page;
+               struct inode *inode = page->mapping->host;
+               struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
 
                /* We always issue full-page reads, but if some block
                 * in a page fails to read, blk_update_request() will
@@ -2484,11 +2487,11 @@ static void end_bio_extent_writepage(struct bio *bio)
                 * if they don't add up to a full page.  */
                if (bvec->bv_offset || bvec->bv_len != PAGE_SIZE) {
                        if (bvec->bv_offset + bvec->bv_len != PAGE_SIZE)
-                               btrfs_err(BTRFS_I(page->mapping->host)->root->fs_info,
+                               btrfs_err(fs_info,
                                   "partial page write in btrfs with offset %u and length %u",
                                        bvec->bv_offset, bvec->bv_len);
                        else
-                               btrfs_info(BTRFS_I(page->mapping->host)->root->fs_info,
+                               btrfs_info(fs_info,
                                   "incomplete page write in btrfs with offset %u and length %u",
                                        bvec->bv_offset, bvec->bv_len);
                }
@@ -5789,6 +5792,7 @@ static void copy_pages(struct page *dst_page, struct page *src_page,
 void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
                           unsigned long src_offset, unsigned long len)
 {
+       struct btrfs_fs_info *fs_info = dst->fs_info;
        size_t cur;
        size_t dst_off_in_page;
        size_t src_off_in_page;
@@ -5797,13 +5801,13 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
        unsigned long src_i;
 
        if (src_offset + len > dst->len) {
-               btrfs_err(dst->fs_info,
+               btrfs_err(fs_info,
                        "memmove bogus src_offset %lu move len %lu dst len %lu",
                         src_offset, len, dst->len);
                BUG_ON(1);
        }
        if (dst_offset + len > dst->len) {
-               btrfs_err(dst->fs_info,
+               btrfs_err(fs_info,
                        "memmove bogus dst_offset %lu move len %lu dst len %lu",
                         dst_offset, len, dst->len);
                BUG_ON(1);
@@ -5835,6 +5839,7 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
 void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
                           unsigned long src_offset, unsigned long len)
 {
+       struct btrfs_fs_info *fs_info = dst->fs_info;
        size_t cur;
        size_t dst_off_in_page;
        size_t src_off_in_page;
@@ -5845,13 +5850,13 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
        unsigned long src_i;
 
        if (src_offset + len > dst->len) {
-               btrfs_err(dst->fs_info,
+               btrfs_err(fs_info,
                          "memmove bogus src_offset %lu move len %lu len %lu",
                          src_offset, len, dst->len);
                BUG_ON(1);
        }
        if (dst_offset + len > dst->len) {
-               btrfs_err(dst->fs_info,
+               btrfs_err(fs_info,
                          "memmove bogus dst_offset %lu move len %lu len %lu",
                          dst_offset, len, dst->len);
                BUG_ON(1);
index 5349e8e9bbaae0df8f440332254c60d575c9bf63..672a3655436346eebe08c74e2c4905e34a1f8b66 100644 (file)
@@ -90,13 +90,14 @@ btrfs_lookup_csum(struct btrfs_trans_handle *trans,
                  struct btrfs_path *path,
                  u64 bytenr, int cow)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        struct btrfs_key file_key;
        struct btrfs_key found_key;
        struct btrfs_csum_item *item;
        struct extent_buffer *leaf;
        u64 csum_offset = 0;
-       u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
+       u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
        int csums_in_item;
 
        file_key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
@@ -116,7 +117,7 @@ btrfs_lookup_csum(struct btrfs_trans_handle *trans,
                        goto fail;
 
                csum_offset = (bytenr - found_key.offset) >>
-                               root->fs_info->sb->s_blocksize_bits;
+                               fs_info->sb->s_blocksize_bits;
                csums_in_item = btrfs_item_size_nr(leaf, path->slots[0]);
                csums_in_item /= csum_size;
 
@@ -163,6 +164,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                                   struct inode *inode, struct bio *bio,
                                   u64 logical_offset, u32 *dst, int dio)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct bio_vec *bvec;
        struct btrfs_io_bio *btrfs_bio = btrfs_io_bio(bio);
        struct btrfs_csum_item *item = NULL;
@@ -177,7 +179,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
        u32 diff;
        int nblocks;
        int count = 0, i;
-       u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
+       u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
 
        path = btrfs_alloc_path();
        if (!path)
@@ -241,7 +243,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
 
                        if (item)
                                btrfs_release_path(path);
-                       item = btrfs_lookup_csum(NULL, root->fs_info->csum_root,
+                       item = btrfs_lookup_csum(NULL, fs_info->csum_root,
                                                 path, disk_bytenr, 0);
                        if (IS_ERR(item)) {
                                count = 1;
@@ -249,10 +251,10 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                                if (BTRFS_I(inode)->root->root_key.objectid ==
                                    BTRFS_DATA_RELOC_TREE_OBJECTID) {
                                        set_extent_bits(io_tree, offset,
-                                               offset + root->fs_info->sectorsize - 1,
+                                               offset + fs_info->sectorsize - 1,
                                                EXTENT_NODATASUM);
                                } else {
-                                       btrfs_info_rl(BTRFS_I(inode)->root->fs_info,
+                                       btrfs_info_rl(fs_info,
                                                   "no csum found for inode %llu start %llu",
                                               btrfs_ino(inode), offset);
                                }
@@ -268,7 +270,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                                                       path->slots[0]);
                        item_last_offset = item_start_offset +
                                (item_size / csum_size) *
-                               root->fs_info->sectorsize;
+                               fs_info->sectorsize;
                        item = btrfs_item_ptr(path->nodes[0], path->slots[0],
                                              struct btrfs_csum_item);
                }
@@ -277,7 +279,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                 * a single leaf so it will also fit inside a u32
                 */
                diff = disk_bytenr - item_start_offset;
-               diff = diff / root->fs_info->sectorsize;
+               diff = diff / fs_info->sectorsize;
                diff = diff * csum_size;
                count = min_t(int, nblocks, (item_last_offset - disk_bytenr) >>
                                            inode->i_sb->s_blocksize_bits);
@@ -289,9 +291,9 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                nblocks -= count;
 next:
                while (count--) {
-                       disk_bytenr += root->fs_info->sectorsize;
-                       offset += root->fs_info->sectorsize;
-                       page_bytes_left -= root->fs_info->sectorsize;
+                       disk_bytenr += fs_info->sectorsize;
+                       offset += fs_info->sectorsize;
+                       page_bytes_left -= fs_info->sectorsize;
                        if (!page_bytes_left)
                                break; /* move to next bio */
                }
@@ -317,6 +319,7 @@ int btrfs_lookup_bio_sums_dio(struct btrfs_root *root, struct inode *inode,
 int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                             struct list_head *list, int search_commit)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key key;
        struct btrfs_path *path;
        struct extent_buffer *leaf;
@@ -327,10 +330,10 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
        int ret;
        size_t size;
        u64 csum_end;
-       u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
+       u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
 
-       ASSERT(IS_ALIGNED(start, root->fs_info->sectorsize) &&
-              IS_ALIGNED(end + 1, root->fs_info->sectorsize));
+       ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&
+              IS_ALIGNED(end + 1, fs_info->sectorsize));
 
        path = btrfs_alloc_path();
        if (!path)
@@ -355,7 +358,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                if (key.objectid == BTRFS_EXTENT_CSUM_OBJECTID &&
                    key.type == BTRFS_EXTENT_CSUM_KEY) {
                        offset = (start - key.offset) >>
-                                root->fs_info->sb->s_blocksize_bits;
+                                fs_info->sb->s_blocksize_bits;
                        if (offset * csum_size <
                            btrfs_item_size_nr(leaf, path->slots[0] - 1))
                                path->slots[0]--;
@@ -383,7 +386,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                        start = key.offset;
 
                size = btrfs_item_size_nr(leaf, path->slots[0]);
-               csum_end = key.offset + (size / csum_size) * root->fs_info->sectorsize;
+               csum_end = key.offset + (size / csum_size) * fs_info->sectorsize;
                if (csum_end <= start) {
                        path->slots[0]++;
                        continue;
@@ -394,9 +397,8 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                                      struct btrfs_csum_item);
                while (start < csum_end) {
                        size = min_t(size_t, csum_end - start,
-                                    MAX_ORDERED_SUM_BYTES(root->fs_info));
-                       sums = kzalloc(btrfs_ordered_sum_size(root->fs_info,
-                                                             size),
+                                    MAX_ORDERED_SUM_BYTES(fs_info));
+                       sums = kzalloc(btrfs_ordered_sum_size(fs_info, size),
                                       GFP_NOFS);
                        if (!sums) {
                                ret = -ENOMEM;
@@ -407,16 +409,16 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                        sums->len = (int)size;
 
                        offset = (start - key.offset) >>
-                               root->fs_info->sb->s_blocksize_bits;
+                               fs_info->sb->s_blocksize_bits;
                        offset *= csum_size;
-                       size >>= root->fs_info->sb->s_blocksize_bits;
+                       size >>= fs_info->sb->s_blocksize_bits;
 
                        read_extent_buffer(path->nodes[0],
                                           sums->sums,
                                           ((unsigned long)item) + offset,
                                           csum_size * size);
 
-                       start += root->fs_info->sectorsize * size;
+                       start += fs_info->sectorsize * size;
                        list_add_tail(&sums->list, &tmplist);
                }
                path->slots[0]++;
@@ -437,6 +439,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
 int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
                       struct bio *bio, u64 file_start, int contig)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ordered_sum *sums;
        struct btrfs_ordered_extent *ordered = NULL;
        char *data;
@@ -449,8 +452,7 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
        u64 offset;
 
        WARN_ON(bio->bi_vcnt <= 0);
-       sums = kzalloc(btrfs_ordered_sum_size(root->fs_info,
-                                             bio->bi_iter.bi_size),
+       sums = kzalloc(btrfs_ordered_sum_size(fs_info, bio->bi_iter.bi_size),
                       GFP_NOFS);
        if (!sums)
                return -ENOMEM;
@@ -477,9 +479,9 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
 
                data = kmap_atomic(bvec->bv_page);
 
-               nr_sectors = BTRFS_BYTES_TO_BLKS(root->fs_info,
-                                               bvec->bv_len + root->fs_info->sectorsize
-                                               - 1);
+               nr_sectors = BTRFS_BYTES_TO_BLKS(fs_info,
+                                                bvec->bv_len + fs_info->sectorsize
+                                                - 1);
 
                for (i = 0; i < nr_sectors; i++) {
                        if (offset >= ordered->file_offset + ordered->len ||
@@ -494,8 +496,8 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
 
                                bytes_left = bio->bi_iter.bi_size - total_bytes;
 
-                               sums = kzalloc(btrfs_ordered_sum_size(root->fs_info, bytes_left),
-                                       GFP_NOFS);
+                               sums = kzalloc(btrfs_ordered_sum_size(fs_info, bytes_left),
+                                              GFP_NOFS);
                                BUG_ON(!sums); /* -ENOMEM */
                                sums->len = bytes_left;
                                ordered = btrfs_lookup_ordered_extent(inode,
@@ -511,15 +513,15 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
                        sums->sums[index] = ~(u32)0;
                        sums->sums[index]
                                = btrfs_csum_data(data + bvec->bv_offset
-                                               + (i * root->fs_info->sectorsize),
+                                               + (i * fs_info->sectorsize),
                                                sums->sums[index],
-                                               root->fs_info->sectorsize);
+                                               fs_info->sectorsize);
                        btrfs_csum_final(sums->sums[index],
                                        (char *)(sums->sums + index));
                        index++;
-                       offset += root->fs_info->sectorsize;
-                       this_sum_bytes += root->fs_info->sectorsize;
-                       total_bytes += root->fs_info->sectorsize;
+                       offset += fs_info->sectorsize;
+                       this_sum_bytes += fs_info->sectorsize;
+                       total_bytes += fs_info->sectorsize;
                }
 
                kunmap_atomic(data);
@@ -546,15 +548,16 @@ static noinline void truncate_one_csum(struct btrfs_root *root,
                                       struct btrfs_key *key,
                                       u64 bytenr, u64 len)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *leaf;
-       u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
+       u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
        u64 csum_end;
        u64 end_byte = bytenr + len;
-       u32 blocksize_bits = root->fs_info->sb->s_blocksize_bits;
+       u32 blocksize_bits = fs_info->sb->s_blocksize_bits;
 
        leaf = path->nodes[0];
        csum_end = btrfs_item_size_nr(leaf, path->slots[0]) / csum_size;
-       csum_end <<= root->fs_info->sb->s_blocksize_bits;
+       csum_end <<= fs_info->sb->s_blocksize_bits;
        csum_end += key->offset;
 
        if (key->offset < bytenr && csum_end <= end_byte) {
@@ -581,7 +584,7 @@ static noinline void truncate_one_csum(struct btrfs_root *root,
                btrfs_truncate_item(root, path, new_size, 0);
 
                key->offset = end_byte;
-               btrfs_set_item_key_safe(root->fs_info, path, key);
+               btrfs_set_item_key_safe(fs_info, path, key);
        } else {
                BUG();
        }
@@ -601,8 +604,8 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
        u64 csum_end;
        struct extent_buffer *leaf;
        int ret;
-       u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
-       int blocksize_bits = root->fs_info->sb->s_blocksize_bits;
+       u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
+       int blocksize_bits = fs_info->sb->s_blocksize_bits;
 
        path = btrfs_alloc_path();
        if (!path)
@@ -711,6 +714,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
                           struct btrfs_ordered_sum *sums)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key file_key;
        struct btrfs_key found_key;
        struct btrfs_path *path;
@@ -726,7 +730,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
        int index = 0;
        int found_next;
        int ret;
-       u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
+       u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
 
        path = btrfs_alloc_path();
        if (!path)
@@ -759,7 +763,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                leaf = path->nodes[0];
                item_size = btrfs_item_size_nr(leaf, path->slots[0]);
                if ((item_size / csum_size) >=
-                   MAX_CSUM_ITEMS(root->fs_info, csum_size)) {
+                   MAX_CSUM_ITEMS(fs_info, csum_size)) {
                        /* already at max size, make a new one */
                        goto insert;
                }
@@ -805,11 +809,11 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
        leaf = path->nodes[0];
        btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
        csum_offset = (bytenr - found_key.offset) >>
-                       root->fs_info->sb->s_blocksize_bits;
+                       fs_info->sb->s_blocksize_bits;
 
        if (found_key.type != BTRFS_EXTENT_CSUM_KEY ||
            found_key.objectid != BTRFS_EXTENT_CSUM_OBJECTID ||
-           csum_offset >= MAX_CSUM_ITEMS(root->fs_info, csum_size)) {
+           csum_offset >= MAX_CSUM_ITEMS(fs_info, csum_size)) {
                goto insert;
        }
 
@@ -827,12 +831,13 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                free_space = btrfs_leaf_free_space(root, leaf) -
                                         sizeof(struct btrfs_item) - csum_size;
                tmp = sums->len - total_bytes;
-               tmp >>= root->fs_info->sb->s_blocksize_bits;
+               tmp >>= fs_info->sb->s_blocksize_bits;
                WARN_ON(tmp < 1);
 
                extend_nr = max_t(int, 1, (int)tmp);
                diff = (csum_offset + extend_nr) * csum_size;
-               diff = min(diff, MAX_CSUM_ITEMS(root->fs_info, csum_size) * csum_size);
+               diff = min(diff,
+                          MAX_CSUM_ITEMS(fs_info, csum_size) * csum_size);
 
                diff = diff - btrfs_item_size_nr(leaf, path->slots[0]);
                diff = min(free_space, diff);
@@ -851,12 +856,12 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                u64 tmp;
 
                tmp = sums->len - total_bytes;
-               tmp >>= root->fs_info->sb->s_blocksize_bits;
+               tmp >>= fs_info->sb->s_blocksize_bits;
                tmp = min(tmp, (next_offset - file_key.offset) >>
-                                        root->fs_info->sb->s_blocksize_bits);
+                                        fs_info->sb->s_blocksize_bits);
 
                tmp = max((u64)1, tmp);
-               tmp = min(tmp, (u64)MAX_CSUM_ITEMS(root->fs_info, csum_size));
+               tmp = min(tmp, (u64)MAX_CSUM_ITEMS(fs_info, csum_size));
                ins_size = csum_size * tmp;
        } else {
                ins_size = csum_size;
@@ -878,7 +883,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                                          csum_offset * csum_size);
 found:
        ins_size = (u32)(sums->len - total_bytes) >>
-                  root->fs_info->sb->s_blocksize_bits;
+                  fs_info->sb->s_blocksize_bits;
        ins_size *= csum_size;
        ins_size = min_t(u32, (unsigned long)item_end - (unsigned long)item,
                              ins_size);
@@ -886,7 +891,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                            ins_size);
 
        ins_size /= csum_size;
-       total_bytes += ins_size * root->fs_info->sectorsize;
+       total_bytes += ins_size * fs_info->sectorsize;
        index += ins_size;
 
        btrfs_mark_buffer_dirty(path->nodes[0]);
@@ -909,6 +914,7 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
                                     const bool new_inline,
                                     struct extent_map *em)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_buffer *leaf = path->nodes[0];
        const int slot = path->slots[0];
@@ -918,7 +924,7 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
        u8 type = btrfs_file_extent_type(leaf, fi);
        int compress_type = btrfs_file_extent_compression(leaf, fi);
 
-       em->bdev = root->fs_info->fs_devices->latest_bdev;
+       em->bdev = fs_info->fs_devices->latest_bdev;
        btrfs_item_key_to_cpu(leaf, &key, slot);
        extent_start = key.offset;
 
@@ -930,7 +936,7 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
                size_t size;
                size = btrfs_file_extent_inline_len(leaf, slot, fi);
                extent_end = ALIGN(extent_start + size,
-                                  root->fs_info->sectorsize);
+                                  fs_info->sectorsize);
        }
 
        em->ram_bytes = btrfs_file_extent_ram_bytes(leaf, fi);
@@ -973,7 +979,7 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
                        em->compress_type = compress_type;
                }
        } else {
-               btrfs_err(root->fs_info,
+               btrfs_err(fs_info,
                          "unknown file extent item type %d, inode %llu, offset %llu, root %llu",
                          type, btrfs_ino(inode), extent_start,
                          root->root_key.objectid);
index 008670e3c98a126f82d87d0a087b87acf2806d4b..d49d8eadf517b369aa54fdc8f6ae2bb9f1ba3972 100644 (file)
@@ -95,13 +95,13 @@ static int __compare_inode_defrag(struct inode_defrag *defrag1,
 static int __btrfs_add_inode_defrag(struct inode *inode,
                                    struct inode_defrag *defrag)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct inode_defrag *entry;
        struct rb_node **p;
        struct rb_node *parent = NULL;
        int ret;
 
-       p = &root->fs_info->defrag_inodes.rb_node;
+       p = &fs_info->defrag_inodes.rb_node;
        while (*p) {
                parent = *p;
                entry = rb_entry(parent, struct inode_defrag, rb_node);
@@ -125,16 +125,18 @@ static int __btrfs_add_inode_defrag(struct inode *inode,
        }
        set_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags);
        rb_link_node(&defrag->rb_node, parent, p);
-       rb_insert_color(&defrag->rb_node, &root->fs_info->defrag_inodes);
+       rb_insert_color(&defrag->rb_node, &fs_info->defrag_inodes);
        return 0;
 }
 
 static inline int __need_auto_defrag(struct btrfs_root *root)
 {
-       if (!btrfs_test_opt(root->fs_info, AUTO_DEFRAG))
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       if (!btrfs_test_opt(fs_info, AUTO_DEFRAG))
                return 0;
 
-       if (btrfs_fs_closing(root->fs_info))
+       if (btrfs_fs_closing(fs_info))
                return 0;
 
        return 1;
@@ -147,6 +149,7 @@ static inline int __need_auto_defrag(struct btrfs_root *root)
 int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
                           struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct inode_defrag *defrag;
        u64 transid;
@@ -171,7 +174,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
        defrag->transid = transid;
        defrag->root = root->root_key.objectid;
 
-       spin_lock(&root->fs_info->defrag_inodes_lock);
+       spin_lock(&fs_info->defrag_inodes_lock);
        if (!test_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags)) {
                /*
                 * If we set IN_DEFRAG flag and evict the inode from memory,
@@ -184,7 +187,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
        } else {
                kmem_cache_free(btrfs_inode_defrag_cachep, defrag);
        }
-       spin_unlock(&root->fs_info->defrag_inodes_lock);
+       spin_unlock(&fs_info->defrag_inodes_lock);
        return 0;
 }
 
@@ -196,6 +199,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
 static void btrfs_requeue_inode_defrag(struct inode *inode,
                                       struct inode_defrag *defrag)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        int ret;
 
@@ -206,9 +210,9 @@ static void btrfs_requeue_inode_defrag(struct inode *inode,
         * Here we don't check the IN_DEFRAG flag, because we need merge
         * them together.
         */
-       spin_lock(&root->fs_info->defrag_inodes_lock);
+       spin_lock(&fs_info->defrag_inodes_lock);
        ret = __btrfs_add_inode_defrag(inode, defrag);
-       spin_unlock(&root->fs_info->defrag_inodes_lock);
+       spin_unlock(&fs_info->defrag_inodes_lock);
        if (ret)
                goto out;
        return;
@@ -489,6 +493,7 @@ int btrfs_dirty_pages(struct btrfs_root *root, struct inode *inode,
                             loff_t pos, size_t write_bytes,
                             struct extent_state **cached)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int err = 0;
        int i;
        u64 num_bytes;
@@ -497,9 +502,9 @@ int btrfs_dirty_pages(struct btrfs_root *root, struct inode *inode,
        u64 end_pos = pos + write_bytes;
        loff_t isize = i_size_read(inode);
 
-       start_pos = pos & ~((u64) root->fs_info->sectorsize - 1);
+       start_pos = pos & ~((u64) fs_info->sectorsize - 1);
        num_bytes = round_up(write_bytes + pos - start_pos,
-                            root->fs_info->sectorsize);
+                            fs_info->sectorsize);
 
        end_of_last_block = start_pos + num_bytes - 1;
        err = btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block,
@@ -696,6 +701,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
                         u32 extent_item_size,
                         int *key_inserted)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_buffer *leaf;
        struct btrfs_file_extent_item *fi;
        struct btrfs_key key;
@@ -724,7 +730,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
                modify_tree = 0;
 
        update_refs = (test_bit(BTRFS_ROOT_REF_COWS, &root->state) ||
-                      root == root->fs_info->tree_root);
+                      root == fs_info->tree_root);
        while (1) {
                recow = 0;
                ret = btrfs_lookup_file_extent(trans, root, path, ino,
@@ -881,7 +887,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
 
                        memcpy(&new_key, &key, sizeof(new_key));
                        new_key.offset = end;
-                       btrfs_set_item_key_safe(root->fs_info, path, &new_key);
+                       btrfs_set_item_key_safe(fs_info, path, &new_key);
 
                        extent_offset += end - key.offset;
                        btrfs_set_file_extent_offset(leaf, fi, extent_offset);
@@ -936,7 +942,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
                                inode_sub_bytes(inode,
                                                extent_end - key.offset);
                                extent_end = ALIGN(extent_end,
-                                                  root->fs_info->sectorsize);
+                                                  fs_info->sectorsize);
                        } else if (update_refs && disk_bytenr > 0) {
                                ret = btrfs_free_extent(trans, root,
                                                disk_bytenr, num_bytes, 0,
@@ -1082,6 +1088,7 @@ static int extent_mergeable(struct extent_buffer *leaf, int slot,
 int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
                              struct inode *inode, u64 start, u64 end)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_buffer *leaf;
        struct btrfs_path *path;
@@ -1151,7 +1158,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
                                     ino, bytenr, orig_offset,
                                     &other_start, &other_end)) {
                        new_key.offset = end;
-                       btrfs_set_item_key_safe(root->fs_info, path, &new_key);
+                       btrfs_set_item_key_safe(fs_info, path, &new_key);
                        fi = btrfs_item_ptr(leaf, path->slots[0],
                                            struct btrfs_file_extent_item);
                        btrfs_set_file_extent_generation(leaf, fi,
@@ -1185,7 +1192,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
                                                         trans->transid);
                        path->slots[0]++;
                        new_key.offset = start;
-                       btrfs_set_item_key_safe(root->fs_info, path, &new_key);
+                       btrfs_set_item_key_safe(fs_info, path, &new_key);
 
                        fi = btrfs_item_ptr(leaf, path->slots[0],
                                            struct btrfs_file_extent_item);
@@ -1418,16 +1425,16 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages,
                                u64 *lockstart, u64 *lockend,
                                struct extent_state **cached_state)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        u64 start_pos;
        u64 last_pos;
        int i;
        int ret = 0;
 
-       start_pos = round_down(pos, root->fs_info->sectorsize);
+       start_pos = round_down(pos, fs_info->sectorsize);
        last_pos = start_pos
                + round_up(pos + write_bytes - start_pos,
-                          root->fs_info->sectorsize) - 1;
+                          fs_info->sectorsize) - 1;
 
        if (start_pos < inode->i_size) {
                struct btrfs_ordered_extent *ordered;
@@ -1474,6 +1481,7 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages,
 static noinline int check_can_nocow(struct inode *inode, loff_t pos,
                                    size_t *write_bytes)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ordered_extent *ordered;
        u64 lockstart, lockend;
@@ -1484,9 +1492,9 @@ static noinline int check_can_nocow(struct inode *inode, loff_t pos,
        if (!ret)
                return -ENOSPC;
 
-       lockstart = round_down(pos, root->fs_info->sectorsize);
+       lockstart = round_down(pos, fs_info->sectorsize);
        lockend = round_up(pos + *write_bytes,
-                          root->fs_info->sectorsize) - 1;
+                          fs_info->sectorsize) - 1;
 
        while (1) {
                lock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend);
@@ -1520,8 +1528,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                                               loff_t pos)
 {
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct btrfs_fs_info *fs_info = root->fs_info;
        struct page **pages = NULL;
        struct extent_state *cached_state = NULL;
        u64 release_bytes = 0;
@@ -1633,12 +1641,10 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
 
                copied = btrfs_copy_from_user(pos, write_bytes, pages, i);
 
-               num_sectors = BTRFS_BYTES_TO_BLKS(root->fs_info,
-                                               reserve_bytes);
+               num_sectors = BTRFS_BYTES_TO_BLKS(fs_info, reserve_bytes);
                dirty_sectors = round_up(copied + sector_offset,
-                                       root->fs_info->sectorsize);
-               dirty_sectors = BTRFS_BYTES_TO_BLKS(root->fs_info,
-                                               dirty_sectors);
+                                       fs_info->sectorsize);
+               dirty_sectors = BTRFS_BYTES_TO_BLKS(fs_info, dirty_sectors);
 
                /*
                 * if we have trouble faulting in the pages, fall
@@ -1666,11 +1672,9 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                 * managed to copy.
                 */
                if (num_sectors > dirty_sectors) {
-
                        /* release everything except the sectors we dirtied */
                        release_bytes -= dirty_sectors <<
-                               root->fs_info->sb->s_blocksize_bits;
-
+                                               fs_info->sb->s_blocksize_bits;
                        if (copied > 0) {
                                spin_lock(&BTRFS_I(inode)->lock);
                                BTRFS_I(inode)->outstanding_extents++;
@@ -1683,7 +1687,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                                u64 __pos;
 
                                __pos = round_down(pos,
-                                                  root->fs_info->sectorsize) +
+                                                  fs_info->sectorsize) +
                                        (dirty_pages << PAGE_SHIFT);
                                btrfs_delalloc_release_space(inode, __pos,
                                                             release_bytes);
@@ -1691,7 +1695,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                }
 
                release_bytes = round_up(copied + sector_offset,
-                                       root->fs_info->sectorsize);
+                                       fs_info->sectorsize);
 
                if (copied > 0)
                        ret = btrfs_dirty_pages(root, inode, pages,
@@ -1712,9 +1716,9 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
 
                if (only_release_metadata && copied > 0) {
                        lockstart = round_down(pos,
-                                              root->fs_info->sectorsize);
+                                              fs_info->sectorsize);
                        lockend = round_up(pos + copied,
-                                          root->fs_info->sectorsize) - 1;
+                                          fs_info->sectorsize) - 1;
 
                        set_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,
                                       lockend, EXTENT_NORESERVE, NULL,
@@ -1727,7 +1731,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                cond_resched();
 
                balance_dirty_pages_ratelimited(inode->i_mapping);
-               if (dirty_pages < (root->fs_info->nodesize >> PAGE_SHIFT) + 1)
+               if (dirty_pages < (fs_info->nodesize >> PAGE_SHIFT) + 1)
                        btrfs_btree_balance_dirty(root);
 
                pos += copied;
@@ -1742,7 +1746,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                        btrfs_delalloc_release_metadata(inode, release_bytes);
                } else {
                        btrfs_delalloc_release_space(inode,
-                                               round_down(pos, root->fs_info->sectorsize),
+                                               round_down(pos, fs_info->sectorsize),
                                                release_bytes);
                }
        }
@@ -1813,6 +1817,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
 {
        struct file *file = iocb->ki_filp;
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        u64 start_pos;
        u64 end_pos;
@@ -1844,7 +1849,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
         * although we have opened a file as writable, we have
         * to stop this write operation to ensure FS consistency.
         */
-       if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state)) {
+       if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) {
                inode_unlock(inode);
                err = -EROFS;
                goto out;
@@ -1860,18 +1865,18 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
 
        pos = iocb->ki_pos;
        count = iov_iter_count(from);
-       start_pos = round_down(pos, root->fs_info->sectorsize);
+       start_pos = round_down(pos, fs_info->sectorsize);
        oldsize = i_size_read(inode);
        if (start_pos > oldsize) {
                /* Expand hole size to cover write data, preventing empty gap */
                end_pos = round_up(pos + count,
-                                  root->fs_info->sectorsize);
+                                  fs_info->sectorsize);
                err = btrfs_cont_expand(inode, oldsize, end_pos);
                if (err) {
                        inode_unlock(inode);
                        goto out;
                }
-               if (start_pos > round_up(oldsize, root->fs_info->sectorsize))
+               if (start_pos > round_up(oldsize, fs_info->sectorsize))
                        clean_page = 1;
        }
 
@@ -1951,6 +1956,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 {
        struct dentry *dentry = file_dentry(file);
        struct inode *inode = d_inode(dentry);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans;
        struct btrfs_log_ctx ctx;
@@ -2061,12 +2067,12 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
         * commit does not start nor waits for ordered extents to complete.
         */
        smp_mb();
-       if (btrfs_inode_in_log(inode, root->fs_info->generation) ||
+       if (btrfs_inode_in_log(inode, fs_info->generation) ||
            (full_sync && BTRFS_I(inode)->last_trans <=
-            root->fs_info->last_trans_committed) ||
+            fs_info->last_trans_committed) ||
            (!btrfs_have_ordered_extents_in_range(inode, start, len) &&
             BTRFS_I(inode)->last_trans
-            <= root->fs_info->last_trans_committed)) {
+            <= fs_info->last_trans_committed)) {
                /*
                 * We've had everything committed since the last time we were
                 * modified so clear this flag in case it was set for whatever
@@ -2224,6 +2230,7 @@ static int hole_mergeable(struct inode *inode, struct extent_buffer *leaf,
 static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
                      struct btrfs_path *path, u64 offset, u64 end)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_buffer *leaf;
        struct btrfs_file_extent_item *fi;
@@ -2232,7 +2239,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
        struct btrfs_key key;
        int ret;
 
-       if (btrfs_fs_incompat(root->fs_info, NO_HOLES))
+       if (btrfs_fs_incompat(fs_info, NO_HOLES))
                goto out;
 
        key.objectid = btrfs_ino(inode);
@@ -2270,7 +2277,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
                u64 num_bytes;
 
                key.offset = offset;
-               btrfs_set_item_key_safe(root->fs_info, path, &key);
+               btrfs_set_item_key_safe(fs_info, path, &key);
                fi = btrfs_item_ptr(leaf, path->slots[0],
                                    struct btrfs_file_extent_item);
                num_bytes = btrfs_file_extent_num_bytes(leaf, fi) + end -
@@ -2306,7 +2313,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
                hole_em->block_start = EXTENT_MAP_HOLE;
                hole_em->block_len = 0;
                hole_em->orig_block_len = 0;
-               hole_em->bdev = root->fs_info->fs_devices->latest_bdev;
+               hole_em->bdev = fs_info->fs_devices->latest_bdev;
                hole_em->compress_type = BTRFS_COMPRESS_NONE;
                hole_em->generation = trans->transid;
 
@@ -2358,6 +2365,7 @@ static int find_first_non_hole(struct inode *inode, u64 *start, u64 *len)
 
 static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_state *cached_state = NULL;
        struct btrfs_path *path;
@@ -2369,13 +2377,13 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
        u64 tail_len;
        u64 orig_start = offset;
        u64 cur_offset;
-       u64 min_size = btrfs_calc_trunc_metadata_size(root->fs_info, 1);
+       u64 min_size = btrfs_calc_trunc_metadata_size(fs_info, 1);
        u64 drop_end;
        int ret = 0;
        int err = 0;
        unsigned int rsv_count;
        bool same_block;
-       bool no_holes = btrfs_fs_incompat(root->fs_info, NO_HOLES);
+       bool no_holes = btrfs_fs_incompat(fs_info, NO_HOLES);
        u64 ino_size;
        bool truncated_block = false;
        bool updated_inode = false;
@@ -2385,7 +2393,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                return ret;
 
        inode_lock(inode);
-       ino_size = round_up(inode->i_size, root->fs_info->sectorsize);
+       ino_size = round_up(inode->i_size, fs_info->sectorsize);
        ret = find_first_non_hole(inode, &offset, &len);
        if (ret < 0)
                goto out_only_mutex;
@@ -2398,8 +2406,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
        lockstart = round_up(offset, btrfs_inode_sectorsize(inode));
        lockend = round_down(offset + len,
                             btrfs_inode_sectorsize(inode)) - 1;
-       same_block = (BTRFS_BYTES_TO_BLKS(root->fs_info, offset))
-               == (BTRFS_BYTES_TO_BLKS(root->fs_info, offset + len - 1));
+       same_block = (BTRFS_BYTES_TO_BLKS(fs_info, offset))
+               == (BTRFS_BYTES_TO_BLKS(fs_info, offset + len - 1));
        /*
         * We needn't truncate any block which is beyond the end of the file
         * because we are sure there is no data there.
@@ -2408,7 +2416,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
         * Only do this if we are in the same block and we aren't doing the
         * entire block.
         */
-       if (same_block && len < root->fs_info->sectorsize) {
+       if (same_block && len < fs_info->sectorsize) {
                if (offset < ino_size) {
                        truncated_block = true;
                        ret = btrfs_truncate_block(inode, offset, len, 0);
@@ -2516,7 +2524,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                ret = -ENOMEM;
                goto out_free;
        }
-       rsv->size = btrfs_calc_trunc_metadata_size(root->fs_info, 1);
+       rsv->size = btrfs_calc_trunc_metadata_size(fs_info, 1);
        rsv->failfast = 1;
 
        /*
@@ -2531,7 +2539,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                goto out_free;
        }
 
-       ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, rsv,
+       ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,
                                      min_size, 0);
        BUG_ON(ret);
        trans->block_rsv = rsv;
@@ -2545,7 +2553,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                if (ret != -ENOSPC)
                        break;
 
-               trans->block_rsv = &root->fs_info->trans_block_rsv;
+               trans->block_rsv = &fs_info->trans_block_rsv;
 
                if (cur_offset < drop_end && cur_offset < ino_size) {
                        ret = fill_holes(trans, inode, path, cur_offset,
@@ -2581,7 +2589,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                        break;
                }
 
-               ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv,
+               ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,
                                              rsv, min_size, 0);
                BUG_ON(ret);    /* shouldn't happen */
                trans->block_rsv = rsv;
@@ -2600,7 +2608,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                goto out_trans;
        }
 
-       trans->block_rsv = &root->fs_info->trans_block_rsv;
+       trans->block_rsv = &fs_info->trans_block_rsv;
        /*
         * If we are using the NO_HOLES feature we might have had already an
         * hole that overlaps a part of the region [lockstart, lockend] and
@@ -2636,7 +2644,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
        inode_inc_iversion(inode);
        inode->i_mtime = inode->i_ctime = current_time(inode);
 
-       trans->block_rsv = &root->fs_info->trans_block_rsv;
+       trans->block_rsv = &fs_info->trans_block_rsv;
        ret = btrfs_update_inode(trans, root, inode);
        updated_inode = true;
        btrfs_end_transaction(trans, root);
@@ -2922,7 +2930,7 @@ static long btrfs_fallocate(struct file *file, int mode,
 
 static int find_desired_extent(struct inode *inode, loff_t *offset, int whence)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct extent_map *em = NULL;
        struct extent_state *cached_state = NULL;
        u64 lockstart;
@@ -2940,11 +2948,11 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence)
         */
        start = max_t(loff_t, 0, *offset);
 
-       lockstart = round_down(start, root->fs_info->sectorsize);
+       lockstart = round_down(start, fs_info->sectorsize);
        lockend = round_up(i_size_read(inode),
-                          root->fs_info->sectorsize);
+                          fs_info->sectorsize);
        if (lockend <= lockstart)
-               lockend = lockstart + root->fs_info->sectorsize;
+               lockend = lockstart + fs_info->sectorsize;
        lockend--;
        len = lockend - lockstart + 1;
 
index 842461792d4e56c7ef9cf30c99c42a2d7b3c82f7..e93763673b05209e604b8fce99e1e1a1711058d0 100644 (file)
@@ -47,6 +47,7 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
                                               struct btrfs_path *path,
                                               u64 offset)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key key;
        struct btrfs_key location;
        struct btrfs_disk_key disk_key;
@@ -74,7 +75,7 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
        btrfs_disk_key_to_cpu(&location, &disk_key);
        btrfs_release_path(path);
 
-       inode = btrfs_iget(root->fs_info->sb, &location, root, NULL);
+       inode = btrfs_iget(fs_info->sb, &location, root, NULL);
        if (IS_ERR(inode))
                return inode;
        if (is_bad_inode(inode)) {
@@ -94,6 +95,7 @@ struct inode *lookup_free_space_inode(struct btrfs_root *root,
                                      *block_group, struct btrfs_path *path)
 {
        struct inode *inode = NULL;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u32 flags = BTRFS_INODE_NODATASUM | BTRFS_INODE_NODATACOW;
 
        spin_lock(&block_group->lock);
@@ -110,8 +112,7 @@ struct inode *lookup_free_space_inode(struct btrfs_root *root,
 
        spin_lock(&block_group->lock);
        if (!((BTRFS_I(inode)->flags & flags) == flags)) {
-               btrfs_info(root->fs_info,
-                       "Old style space inode found, converting.");
+               btrfs_info(fs_info, "Old style space inode found, converting.");
                BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM |
                        BTRFS_INODE_NODATACOW;
                block_group->disk_cache_state = BTRFS_DC_CLEAR;
@@ -206,12 +207,13 @@ int create_free_space_inode(struct btrfs_root *root,
 int btrfs_check_trunc_cache_free_space(struct btrfs_root *root,
                                       struct btrfs_block_rsv *rsv)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 needed_bytes;
        int ret;
 
        /* 1 for slack space, 1 for updating the inode */
-       needed_bytes = btrfs_calc_trunc_metadata_size(root->fs_info, 1) +
-               btrfs_calc_trans_metadata_size(root->fs_info, 1);
+       needed_bytes = btrfs_calc_trunc_metadata_size(fs_info, 1) +
+               btrfs_calc_trans_metadata_size(fs_info, 1);
 
        spin_lock(&rsv->lock);
        if (rsv->reserved < needed_bytes)
@@ -667,6 +669,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
                                   struct btrfs_free_space_ctl *ctl,
                                   struct btrfs_path *path, u64 offset)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_free_space_header *header;
        struct extent_buffer *leaf;
        struct btrfs_io_ctl io_ctl;
@@ -706,16 +709,16 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
        btrfs_release_path(path);
 
        if (!BTRFS_I(inode)->generation) {
-               btrfs_info(root->fs_info,
+               btrfs_info(fs_info,
                           "The free space cache file (%llu) is invalid. skip it\n",
                           offset);
                return 0;
        }
 
        if (BTRFS_I(inode)->generation != generation) {
-               btrfs_err(root->fs_info,
-                       "free space inode generation (%llu) did not match free space cache generation (%llu)",
-                       BTRFS_I(inode)->generation, generation);
+               btrfs_err(fs_info,
+                         "free space inode generation (%llu) did not match free space cache generation (%llu)",
+                         BTRFS_I(inode)->generation, generation);
                return 0;
        }
 
@@ -764,7 +767,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
                        ret = link_free_space(ctl, e);
                        spin_unlock(&ctl->tree_lock);
                        if (ret) {
-                               btrfs_err(root->fs_info,
+                               btrfs_err(fs_info,
                                        "Duplicate entries in free space cache, dumping");
                                kmem_cache_free(btrfs_free_space_cachep, e);
                                goto free_cache;
@@ -784,7 +787,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
                        ctl->op->recalc_thresholds(ctl);
                        spin_unlock(&ctl->tree_lock);
                        if (ret) {
-                               btrfs_err(root->fs_info,
+                               btrfs_err(fs_info,
                                        "Duplicate entries in free space cache, dumping");
                                kmem_cache_free(btrfs_free_space_cachep, e);
                                goto free_cache;
@@ -1036,6 +1039,7 @@ write_pinned_extent_entries(struct btrfs_root *root,
                            struct btrfs_io_ctl *io_ctl,
                            int *entries)
 {
+       struct btrfs_fs_info *fs_info;
        u64 start, extent_start, extent_end, len;
        struct extent_io_tree *unpin = NULL;
        int ret;
@@ -1043,6 +1047,8 @@ write_pinned_extent_entries(struct btrfs_root *root,
        if (!block_group)
                return 0;
 
+       fs_info = block_group->fs_info;
+
        /*
         * We want to add any pinned extents to our free space cache
         * so we don't leak the space
@@ -1050,7 +1056,7 @@ write_pinned_extent_entries(struct btrfs_root *root,
         * We shouldn't have switched the pinned extents yet so this is the
         * right one
         */
-       unpin = root->fs_info->pinned_extents;
+       unpin = fs_info->pinned_extents;
 
        start = block_group->key.objectid;
 
@@ -1141,12 +1147,15 @@ int btrfs_wait_cache_io(struct btrfs_root *root,
 {
        int ret;
        struct inode *inode = io_ctl->inode;
+       struct btrfs_fs_info *fs_info;
 
        if (!inode)
                return 0;
 
+       fs_info = btrfs_sb(inode->i_sb);
+
        if (block_group)
-               root = root->fs_info->tree_root;
+               root = fs_info->tree_root;
 
        /* Flush the dirty pages in the cache file. */
        ret = flush_dirty_cache(inode);
@@ -1163,9 +1172,9 @@ int btrfs_wait_cache_io(struct btrfs_root *root,
                BTRFS_I(inode)->generation = 0;
                if (block_group) {
 #ifdef DEBUG
-                       btrfs_err(root->fs_info,
-                               "failed to write free space cache for block group %llu",
-                               block_group->key.objectid);
+                       btrfs_err(fs_info,
+                                 "failed to write free space cache for block group %llu",
+                                 block_group->key.objectid);
 #endif
                }
        }
@@ -1376,9 +1385,9 @@ int btrfs_write_out_cache(struct btrfs_fs_info *fs_info,
                                      path, block_group->key.objectid);
        if (ret) {
 #ifdef DEBUG
-               btrfs_err(root->fs_info,
-                       "failed to write free space cache for block group %llu",
-                       block_group->key.objectid);
+               btrfs_err(fs_info,
+                         "failed to write free space cache for block group %llu",
+                         block_group->key.objectid);
 #endif
                spin_lock(&block_group->lock);
                block_group->disk_cache_state = BTRFS_DC_ERROR;
@@ -1965,11 +1974,11 @@ static bool use_bitmap(struct btrfs_free_space_ctl *ctl,
                      struct btrfs_free_space *info)
 {
        struct btrfs_block_group_cache *block_group = ctl->private;
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
        bool forced = false;
 
 #ifdef CONFIG_BTRFS_DEBUG
-       if (btrfs_should_fragment_free_space(block_group->fs_info->extent_root,
-                                            block_group))
+       if (btrfs_should_fragment_free_space(fs_info->extent_root, block_group))
                forced = true;
 #endif
 
@@ -1985,7 +1994,7 @@ static bool use_bitmap(struct btrfs_free_space_ctl *ctl,
                 * of cache left then go ahead an dadd them, no sense in adding
                 * the overhead of a bitmap if we don't have to.
                 */
-               if (info->bytes <= block_group->fs_info->sectorsize * 4) {
+               if (info->bytes <= fs_info->sectorsize * 4) {
                        if (ctl->free_extents * 2 <= ctl->extents_thresh)
                                return false;
                } else {
@@ -2444,6 +2453,7 @@ int btrfs_remove_free_space(struct btrfs_block_group_cache *block_group,
 void btrfs_dump_free_space(struct btrfs_block_group_cache *block_group,
                           u64 bytes)
 {
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
        struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl;
        struct btrfs_free_space *info;
        struct rb_node *n;
@@ -2453,23 +2463,23 @@ void btrfs_dump_free_space(struct btrfs_block_group_cache *block_group,
                info = rb_entry(n, struct btrfs_free_space, offset_index);
                if (info->bytes >= bytes && !block_group->ro)
                        count++;
-               btrfs_crit(block_group->fs_info,
-                          "entry offset %llu, bytes %llu, bitmap %s",
+               btrfs_crit(fs_info, "entry offset %llu, bytes %llu, bitmap %s",
                           info->offset, info->bytes,
                       (info->bitmap) ? "yes" : "no");
        }
-       btrfs_info(block_group->fs_info, "block group has cluster?: %s",
+       btrfs_info(fs_info, "block group has cluster?: %s",
               list_empty(&block_group->cluster_list) ? "no" : "yes");
-       btrfs_info(block_group->fs_info,
+       btrfs_info(fs_info,
                   "%d blocks of free space at or bigger than bytes is", count);
 }
 
 void btrfs_init_free_space_ctl(struct btrfs_block_group_cache *block_group)
 {
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
        struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl;
 
        spin_lock_init(&ctl->tree_lock);
-       ctl->unit = block_group->fs_info->sectorsize;
+       ctl->unit = fs_info->sectorsize;
        ctl->start = block_group->key.objectid;
        ctl->private = block_group;
        ctl->op = &free_space_op;
@@ -3014,6 +3024,7 @@ int btrfs_find_space_cluster(struct btrfs_root *root,
                             u64 offset, u64 bytes, u64 empty_size)
 {
        struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl;
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
        struct btrfs_free_space *entry, *tmp;
        LIST_HEAD(bitmaps);
        u64 min_bytes;
@@ -3026,14 +3037,14 @@ int btrfs_find_space_cluster(struct btrfs_root *root,
         * For metadata, allow allocates with smaller extents.  For
         * data, keep it dense.
         */
-       if (btrfs_test_opt(root->fs_info, SSD_SPREAD)) {
+       if (btrfs_test_opt(fs_info, SSD_SPREAD)) {
                cont1_bytes = min_bytes = bytes + empty_size;
        } else if (block_group->flags & BTRFS_BLOCK_GROUP_METADATA) {
                cont1_bytes = bytes;
-               min_bytes = block_group->fs_info->sectorsize;
+               min_bytes = fs_info->sectorsize;
        } else {
                cont1_bytes = max(bytes, (bytes + empty_size) >> 2);
-               min_bytes = block_group->fs_info->sectorsize;
+               min_bytes = fs_info->sectorsize;
        }
 
        spin_lock(&ctl->tree_lock);
@@ -3318,6 +3329,7 @@ void btrfs_get_block_group_trimming(struct btrfs_block_group_cache *cache)
 
 void btrfs_put_block_group_trimming(struct btrfs_block_group_cache *block_group)
 {
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
        struct extent_map_tree *em_tree;
        struct extent_map *em;
        bool cleanup;
@@ -3328,8 +3340,8 @@ void btrfs_put_block_group_trimming(struct btrfs_block_group_cache *block_group)
        spin_unlock(&block_group->lock);
 
        if (cleanup) {
-               lock_chunks(block_group->fs_info);
-               em_tree = &block_group->fs_info->mapping_tree.map_tree;
+               lock_chunks(fs_info);
+               em_tree = &fs_info->mapping_tree.map_tree;
                write_lock(&em_tree->lock);
                em = lookup_extent_mapping(em_tree, block_group->key.objectid,
                                           1);
@@ -3340,7 +3352,7 @@ void btrfs_put_block_group_trimming(struct btrfs_block_group_cache *block_group)
                 */
                remove_extent_mapping(em_tree, em);
                write_unlock(&em_tree->lock);
-               unlock_chunks(block_group->fs_info);
+               unlock_chunks(fs_info);
 
                /* once for us and once for the tree */
                free_extent_map(em);
@@ -3470,7 +3482,7 @@ int load_free_ino_cache(struct btrfs_fs_info *fs_info, struct btrfs_root *root)
        int ret = 0;
        u64 root_gen = btrfs_root_generation(&root->root_item);
 
-       if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
+       if (!btrfs_test_opt(fs_info, INODE_MAP_CACHE))
                return 0;
 
        /*
@@ -3509,12 +3521,13 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root,
                              struct btrfs_path *path,
                              struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_free_space_ctl *ctl = root->free_ino_ctl;
        int ret;
        struct btrfs_io_ctl io_ctl;
        bool release_metadata = true;
 
-       if (!btrfs_test_opt(root->fs_info, INODE_MAP_CACHE))
+       if (!btrfs_test_opt(fs_info, INODE_MAP_CACHE))
                return 0;
 
        memset(&io_ctl, 0, sizeof(io_ctl));
@@ -3535,9 +3548,9 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root,
                if (release_metadata)
                        btrfs_delalloc_release_metadata(inode, inode->i_size);
 #ifdef DEBUG
-               btrfs_err(root->fs_info,
-                       "failed to write free ino cache for root %llu",
-                       root->root_key.objectid);
+               btrfs_err(fs_info,
+                         "failed to write free ino cache for root %llu",
+                         root->root_key.objectid);
 #endif
        }
 
index 9dfb535d8378df41c470faec0409a6b0a32acc86..2a08f518353b276c998c3c103850c58df87502c4 100644 (file)
@@ -189,7 +189,7 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
        int ret;
 
        bitmap_size = free_space_bitmap_size(block_group->key.offset,
-                                            block_group->fs_info->sectorsize);
+                                            fs_info->sectorsize);
        bitmap = alloc_bitmap(bitmap_size);
        if (!bitmap) {
                ret = -ENOMEM;
@@ -227,9 +227,9 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
                                ASSERT(found_key.objectid + found_key.offset <= end);
 
                                first = div_u64(found_key.objectid - start,
-                                               block_group->fs_info->sectorsize);
+                                               fs_info->sectorsize);
                                last = div_u64(found_key.objectid + found_key.offset - start,
-                                              block_group->fs_info->sectorsize);
+                                              fs_info->sectorsize);
                                le_bitmap_set(bitmap, first, last - first);
 
                                extent_count++;
@@ -270,7 +270,7 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
        }
 
        bitmap_cursor = bitmap;
-       bitmap_range = block_group->fs_info->sectorsize * BTRFS_FREE_SPACE_BITMAP_BITS;
+       bitmap_range = fs_info->sectorsize * BTRFS_FREE_SPACE_BITMAP_BITS;
        i = start;
        while (i < end) {
                unsigned long ptr;
@@ -279,7 +279,7 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
 
                extent_size = min(end - i, bitmap_range);
                data_size = free_space_bitmap_size(extent_size,
-                                                  block_group->fs_info->sectorsize);
+                                                  fs_info->sectorsize);
 
                key.objectid = i;
                key.type = BTRFS_FREE_SPACE_BITMAP_KEY;
@@ -330,7 +330,7 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
        int ret;
 
        bitmap_size = free_space_bitmap_size(block_group->key.offset,
-                                            block_group->fs_info->sectorsize);
+                                            fs_info->sectorsize);
        bitmap = alloc_bitmap(bitmap_size);
        if (!bitmap) {
                ret = -ENOMEM;
@@ -370,11 +370,11 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
                                ASSERT(found_key.objectid + found_key.offset <= end);
 
                                bitmap_pos = div_u64(found_key.objectid - start,
-                                                    block_group->fs_info->sectorsize *
+                                                    fs_info->sectorsize *
                                                     BITS_PER_BYTE);
                                bitmap_cursor = bitmap + bitmap_pos;
                                data_size = free_space_bitmap_size(found_key.offset,
-                                                                  block_group->fs_info->sectorsize);
+                                                                  fs_info->sectorsize);
 
                                ptr = btrfs_item_ptr_offset(leaf, path->slots[0] - 1);
                                read_extent_buffer(leaf, bitmap_cursor, ptr,
@@ -425,7 +425,7 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
                        extent_count++;
                }
                prev_bit = bit;
-               offset += block_group->fs_info->sectorsize;
+               offset += fs_info->sectorsize;
                bitnr++;
        }
        if (prev_bit == 1) {
@@ -526,6 +526,7 @@ static void free_space_set_bits(struct btrfs_block_group_cache *block_group,
                                struct btrfs_path *path, u64 *start, u64 *size,
                                int bit)
 {
+       struct btrfs_fs_info *fs_info = block_group->fs_info;
        struct extent_buffer *leaf;
        struct btrfs_key key;
        u64 end = *start + *size;
@@ -545,10 +546,8 @@ static void free_space_set_bits(struct btrfs_block_group_cache *block_group,
                end = found_end;
 
        ptr = btrfs_item_ptr_offset(leaf, path->slots[0]);
-       first = div_u64(*start - found_start,
-                       block_group->fs_info->sectorsize);
-       last = div_u64(end - found_start,
-                      block_group->fs_info->sectorsize);
+       first = div_u64(*start - found_start, fs_info->sectorsize);
+       last = div_u64(end - found_start, fs_info->sectorsize);
        if (bit)
                extent_buffer_bitmap_set(leaf, ptr, first, last - first);
        else
@@ -1270,7 +1269,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
        list_del(&free_space_root->dirty_list);
 
        btrfs_tree_lock(free_space_root->node);
-       clean_tree_block(trans, tree_root->fs_info, free_space_root->node);
+       clean_tree_block(trans, fs_info, free_space_root->node);
        btrfs_tree_unlock(free_space_root->node);
        btrfs_free_tree_block(trans, free_space_root, free_space_root->node,
                              0, 1);
@@ -1476,7 +1475,7 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,
                                extent_count++;
                        }
                        prev_bit = bit;
-                       offset += block_group->fs_info->sectorsize;
+                       offset += fs_info->sectorsize;
                }
        }
        if (prev_bit == 1) {
index b8acc07ac6c2b31b41951384b2b8b051b2cbc910..47270a3c9649b375d08b06fce0752711e7e9a10c 100644 (file)
@@ -328,6 +328,7 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,
                           const char *name, int name_len,
                           u64 inode_objectid, u64 ref_objectid, u64 index)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct btrfs_key key;
        struct btrfs_inode_ref *ref;
@@ -384,7 +385,7 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,
        btrfs_free_path(path);
 
        if (ret == -EMLINK) {
-               struct btrfs_super_block *disk_super = root->fs_info->super_copy;
+               struct btrfs_super_block *disk_super = fs_info->super_copy;
                /* We ran out of space in the ref array. Need to
                 * add an extended ref. */
                if (btrfs_super_incompat_flags(disk_super)
index 0c4926728b6a3ca3def540ae9bd966e088d04a13..79921f6fb8e515af1aac71fe6d079f57036953eb 100644 (file)
@@ -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 @@ int btrfs_save_ino_cache(struct btrfs_root *root,
 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;
index d0a236f5fddc38dcd7fabd946802399a95ffc64b..677762e0dcab355312cb9d9d8fc65f5c569c5605 100644 (file)
@@ -249,11 +249,12 @@ static noinline int cow_file_range_inline(struct btrfs_root *root,
                                          int compress_type,
                                          struct page **compressed_pages)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_trans_handle *trans;
        u64 isize = i_size_read(inode);
        u64 actual_end = min(end + 1, isize);
        u64 inline_len = actual_end - start;
-       u64 aligned_end = ALIGN(end, root->fs_info->sectorsize);
+       u64 aligned_end = ALIGN(end, fs_info->sectorsize);
        u64 data_len = inline_len;
        int ret;
        struct btrfs_path *path;
@@ -264,12 +265,12 @@ static noinline int cow_file_range_inline(struct btrfs_root *root,
                data_len = compressed_size;
 
        if (start > 0 ||
-           actual_end > root->fs_info->sectorsize ||
-           data_len > BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info) ||
+           actual_end > fs_info->sectorsize ||
+           data_len > BTRFS_MAX_INLINE_DATA_SIZE(fs_info) ||
            (!compressed_size &&
-           (actual_end & (root->fs_info->sectorsize - 1)) == 0) ||
+           (actual_end & (fs_info->sectorsize - 1)) == 0) ||
            end + 1 < isize ||
-           data_len > root->fs_info->max_inline) {
+           data_len > fs_info->max_inline) {
                return 1;
        }
 
@@ -282,7 +283,7 @@ static noinline int cow_file_range_inline(struct btrfs_root *root,
                btrfs_free_path(path);
                return PTR_ERR(trans);
        }
-       trans->block_rsv = &root->fs_info->delalloc_block_rsv;
+       trans->block_rsv = &fs_info->delalloc_block_rsv;
 
        if (compressed_size && compressed_pages)
                extent_item_size = btrfs_file_extent_calc_inline_size(
@@ -372,15 +373,15 @@ static noinline int add_async_extent(struct async_cow *cow,
 
 static inline int inode_need_compress(struct inode *inode)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
 
        /* force compress */
-       if (btrfs_test_opt(root->fs_info, FORCE_COMPRESS))
+       if (btrfs_test_opt(fs_info, FORCE_COMPRESS))
                return 1;
        /* bad compression ratios */
        if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS)
                return 0;
-       if (btrfs_test_opt(root->fs_info, COMPRESS) ||
+       if (btrfs_test_opt(fs_info, COMPRESS) ||
            BTRFS_I(inode)->flags & BTRFS_INODE_COMPRESS ||
            BTRFS_I(inode)->force_compress)
                return 1;
@@ -410,9 +411,10 @@ static noinline void compress_file_range(struct inode *inode,
                                        struct async_cow *async_cow,
                                        int *num_added)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        u64 num_bytes;
-       u64 blocksize = root->fs_info->sectorsize;
+       u64 blocksize = fs_info->sectorsize;
        u64 actual_end;
        u64 isize = i_size_read(inode);
        int ret = 0;
@@ -425,7 +427,7 @@ static noinline void compress_file_range(struct inode *inode,
        unsigned long max_uncompressed = SZ_128K;
        int i;
        int will_compress;
-       int compress_type = root->fs_info->compress_type;
+       int compress_type = fs_info->compress_type;
        int redirty = 0;
 
        /* if this is a small write inside eof, kick off a defrag */
@@ -624,7 +626,7 @@ static noinline void compress_file_range(struct inode *inode,
                nr_pages_ret = 0;
 
                /* flag the file so we don't compress in the future */
-               if (!btrfs_test_opt(root->fs_info, FORCE_COMPRESS) &&
+               if (!btrfs_test_opt(fs_info, FORCE_COMPRESS) &&
                    !(BTRFS_I(inode)->force_compress)) {
                        BTRFS_I(inode)->flags |= BTRFS_INODE_NOCOMPRESS;
                }
@@ -682,6 +684,7 @@ static void free_async_extent_pages(struct async_extent *async_extent)
 static noinline void submit_compressed_extents(struct inode *inode,
                                              struct async_cow *async_cow)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct async_extent *async_extent;
        u64 alloc_hint = 0;
        struct btrfs_key ins;
@@ -794,7 +797,7 @@ static noinline void submit_compressed_extents(struct inode *inode,
                em->block_len = ins.offset;
                em->orig_block_len = ins.offset;
                em->ram_bytes = async_extent->ram_size;
-               em->bdev = root->fs_info->fs_devices->latest_bdev;
+               em->bdev = fs_info->fs_devices->latest_bdev;
                em->compress_type = async_extent->compress_type;
                set_bit(EXTENT_FLAG_PINNED, &em->flags);
                set_bit(EXTENT_FLAG_COMPRESSED, &em->flags);
@@ -829,7 +832,7 @@ static noinline void submit_compressed_extents(struct inode *inode,
                                                async_extent->ram_size - 1, 0);
                        goto out_free_reserve;
                }
-               btrfs_dec_block_group_reservations(root->fs_info, ins.objectid);
+               btrfs_dec_block_group_reservations(fs_info, ins.objectid);
 
                /*
                 * clear dirty, set writeback and unlock the pages.
@@ -870,7 +873,7 @@ static noinline void submit_compressed_extents(struct inode *inode,
        }
        return;
 out_free_reserve:
-       btrfs_dec_block_group_reservations(root->fs_info, ins.objectid);
+       btrfs_dec_block_group_reservations(fs_info, ins.objectid);
        btrfs_free_reserved_extent(root, ins.objectid, ins.offset, 1);
 out_free:
        extent_clear_unlock_delalloc(inode, async_extent->start,
@@ -939,13 +942,14 @@ static noinline int cow_file_range(struct inode *inode,
                                   int *page_started, unsigned long *nr_written,
                                   int unlock, struct btrfs_dedupe_hash *hash)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        u64 alloc_hint = 0;
        u64 num_bytes;
        unsigned long ram_size;
        u64 disk_num_bytes;
        u64 cur_alloc_size;
-       u64 blocksize = root->fs_info->sectorsize;
+       u64 blocksize = fs_info->sectorsize;
        struct btrfs_key ins;
        struct extent_map *em;
        struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
@@ -989,7 +993,7 @@ static noinline int cow_file_range(struct inode *inode,
        }
 
        BUG_ON(disk_num_bytes >
-              btrfs_super_total_bytes(root->fs_info->super_copy));
+              btrfs_super_total_bytes(fs_info->super_copy));
 
        alloc_hint = get_extent_allocation_hint(inode, start, num_bytes);
        btrfs_drop_extent_cache(inode, start, start + num_bytes - 1, 0);
@@ -999,8 +1003,7 @@ static noinline int cow_file_range(struct inode *inode,
 
                cur_alloc_size = disk_num_bytes;
                ret = btrfs_reserve_extent(root, cur_alloc_size, cur_alloc_size,
-                                          root->fs_info->sectorsize, 0,
-                                          alloc_hint,
+                                          fs_info->sectorsize, 0, alloc_hint,
                                           &ins, 1, 1);
                if (ret < 0)
                        goto out_unlock;
@@ -1021,7 +1024,7 @@ static noinline int cow_file_range(struct inode *inode,
                em->block_len = ins.offset;
                em->orig_block_len = ins.offset;
                em->ram_bytes = ram_size;
-               em->bdev = root->fs_info->fs_devices->latest_bdev;
+               em->bdev = fs_info->fs_devices->latest_bdev;
                set_bit(EXTENT_FLAG_PINNED, &em->flags);
                em->generation = -1;
 
@@ -1053,7 +1056,7 @@ static noinline int cow_file_range(struct inode *inode,
                                goto out_drop_extent_cache;
                }
 
-               btrfs_dec_block_group_reservations(root->fs_info, ins.objectid);
+               btrfs_dec_block_group_reservations(fs_info, ins.objectid);
 
                if (disk_num_bytes < cur_alloc_size)
                        break;
@@ -1084,7 +1087,7 @@ static noinline int cow_file_range(struct inode *inode,
 out_drop_extent_cache:
        btrfs_drop_extent_cache(inode, start, start + ram_size - 1, 0);
 out_reserve:
-       btrfs_dec_block_group_reservations(root->fs_info, ins.objectid);
+       btrfs_dec_block_group_reservations(fs_info, ins.objectid);
        btrfs_free_reserved_extent(root, ins.objectid, ins.offset, 1);
 out_unlock:
        extent_clear_unlock_delalloc(inode, start, end, delalloc_end,
@@ -1119,6 +1122,7 @@ static noinline void async_cow_start(struct btrfs_work *work)
  */
 static noinline void async_cow_submit(struct btrfs_work *work)
 {
+       struct btrfs_fs_info *fs_info;
        struct async_cow *async_cow;
        struct btrfs_root *root;
        unsigned long nr_pages;
@@ -1126,16 +1130,17 @@ static noinline void async_cow_submit(struct btrfs_work *work)
        async_cow = container_of(work, struct async_cow, work);
 
        root = async_cow->root;
+       fs_info = root->fs_info;
        nr_pages = (async_cow->end - async_cow->start + PAGE_SIZE) >>
                PAGE_SHIFT;
 
        /*
         * atomic_sub_return implies a barrier for waitqueue_active
         */
-       if (atomic_sub_return(nr_pages, &root->fs_info->async_delalloc_pages) <
+       if (atomic_sub_return(nr_pages, &fs_info->async_delalloc_pages) <
            5 * SZ_1M &&
-           waitqueue_active(&root->fs_info->async_submit_wait))
-               wake_up(&root->fs_info->async_submit_wait);
+           waitqueue_active(&fs_info->async_submit_wait))
+               wake_up(&fs_info->async_submit_wait);
 
        if (async_cow->inode)
                submit_compressed_extents(async_cow->inode, async_cow);
@@ -1154,6 +1159,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
                                u64 start, u64 end, int *page_started,
                                unsigned long *nr_written)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct async_cow *async_cow;
        struct btrfs_root *root = BTRFS_I(inode)->root;
        unsigned long nr_pages;
@@ -1171,7 +1177,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
                async_cow->start = start;
 
                if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS &&
-                   !btrfs_test_opt(root->fs_info, FORCE_COMPRESS))
+                   !btrfs_test_opt(fs_info, FORCE_COMPRESS))
                        cur_end = end;
                else
                        cur_end = min(end, start + SZ_512K - 1);
@@ -1186,22 +1192,21 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
 
                nr_pages = (cur_end - start + PAGE_SIZE) >>
                        PAGE_SHIFT;
-               atomic_add(nr_pages, &root->fs_info->async_delalloc_pages);
+               atomic_add(nr_pages, &fs_info->async_delalloc_pages);
 
-               btrfs_queue_work(root->fs_info->delalloc_workers,
-                                &async_cow->work);
+               btrfs_queue_work(fs_info->delalloc_workers, &async_cow->work);
 
-               if (atomic_read(&root->fs_info->async_delalloc_pages) > limit) {
-                       wait_event(root->fs_info->async_submit_wait,
-                          (atomic_read(&root->fs_info->async_delalloc_pages) <
-                           limit));
+               if (atomic_read(&fs_info->async_delalloc_pages) > limit) {
+                       wait_event(fs_info->async_submit_wait,
+                                  (atomic_read(&fs_info->async_delalloc_pages) <
+                                   limit));
                }
 
-               while (atomic_read(&root->fs_info->async_submit_draining) &&
-                     atomic_read(&root->fs_info->async_delalloc_pages)) {
-                       wait_event(root->fs_info->async_submit_wait,
-                         (atomic_read(&root->fs_info->async_delalloc_pages) ==
-                          0));
+               while (atomic_read(&fs_info->async_submit_draining) &&
+                      atomic_read(&fs_info->async_delalloc_pages)) {
+                       wait_event(fs_info->async_submit_wait,
+                                  (atomic_read(&fs_info->async_delalloc_pages) ==
+                                   0));
                }
 
                *nr_written += nr_pages;
@@ -1214,11 +1219,12 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
 static noinline int csum_exist_in_range(struct btrfs_root *root,
                                        u64 bytenr, u64 num_bytes)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        struct btrfs_ordered_sum *sums;
        LIST_HEAD(list);
 
-       ret = btrfs_lookup_csums_range(root->fs_info->csum_root, bytenr,
+       ret = btrfs_lookup_csums_range(fs_info->csum_root, bytenr,
                                       bytenr + num_bytes - 1, &list, 0);
        if (ret == 0 && list_empty(&list))
                return 0;
@@ -1243,6 +1249,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                              u64 start, u64 end, int *page_started, int force,
                              unsigned long *nr_written)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans;
        struct extent_buffer *leaf;
@@ -1298,7 +1305,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                return PTR_ERR(trans);
        }
 
-       trans->block_rsv = &root->fs_info->delalloc_block_rsv;
+       trans->block_rsv = &fs_info->delalloc_block_rsv;
 
        cow_start = (u64)-1;
        cur_offset = start;
@@ -1399,8 +1406,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                         */
                        if (csum_exist_in_range(root, disk_bytenr, num_bytes))
                                goto out_check;
-                       if (!btrfs_inc_nocow_writers(root->fs_info,
-                                                    disk_bytenr))
+                       if (!btrfs_inc_nocow_writers(fs_info, disk_bytenr))
                                goto out_check;
                        nocow = 1;
                } else if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
@@ -1408,7 +1414,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                                btrfs_file_extent_inline_len(leaf,
                                                     path->slots[0], fi);
                        extent_end = ALIGN(extent_end,
-                                          root->fs_info->sectorsize);
+                                          fs_info->sectorsize);
                } else {
                        BUG_ON(1);
                }
@@ -1418,8 +1424,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                        if (!nolock && nocow)
                                btrfs_end_write_no_snapshoting(root);
                        if (nocow)
-                               btrfs_dec_nocow_writers(root->fs_info,
-                                                       disk_bytenr);
+                               btrfs_dec_nocow_writers(fs_info, disk_bytenr);
                        goto next_slot;
                }
                if (!nocow) {
@@ -1442,7 +1447,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                                if (!nolock && nocow)
                                        btrfs_end_write_no_snapshoting(root);
                                if (nocow)
-                                       btrfs_dec_nocow_writers(root->fs_info,
+                                       btrfs_dec_nocow_writers(fs_info,
                                                                disk_bytenr);
                                goto error;
                        }
@@ -1462,7 +1467,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                        em->block_start = disk_bytenr;
                        em->orig_block_len = disk_num_bytes;
                        em->ram_bytes = ram_bytes;
-                       em->bdev = root->fs_info->fs_devices->latest_bdev;
+                       em->bdev = fs_info->fs_devices->latest_bdev;
                        em->mod_start = em->start;
                        em->mod_len = em->len;
                        set_bit(EXTENT_FLAG_PINNED, &em->flags);
@@ -1487,7 +1492,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
                ret = btrfs_add_ordered_extent(inode, cur_offset, disk_bytenr,
                                               num_bytes, num_bytes, type);
                if (nocow)
-                       btrfs_dec_nocow_writers(root->fs_info, disk_bytenr);
+                       btrfs_dec_nocow_writers(fs_info, disk_bytenr);
                BUG_ON(ret); /* -ENOMEM */
 
                if (root->root_key.objectid ==
@@ -1694,6 +1699,8 @@ static void btrfs_merge_extent_hook(struct inode *inode,
 static void btrfs_add_delalloc_inodes(struct btrfs_root *root,
                                      struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+
        spin_lock(&root->delalloc_lock);
        if (list_empty(&BTRFS_I(inode)->delalloc_inodes)) {
                list_add_tail(&BTRFS_I(inode)->delalloc_inodes,
@@ -1702,11 +1709,11 @@ static void btrfs_add_delalloc_inodes(struct btrfs_root *root,
                        &BTRFS_I(inode)->runtime_flags);
                root->nr_delalloc_inodes++;
                if (root->nr_delalloc_inodes == 1) {
-                       spin_lock(&root->fs_info->delalloc_root_lock);
+                       spin_lock(&fs_info->delalloc_root_lock);
                        BUG_ON(!list_empty(&root->delalloc_root));
                        list_add_tail(&root->delalloc_root,
-                                     &root->fs_info->delalloc_roots);
-                       spin_unlock(&root->fs_info->delalloc_root_lock);
+                                     &fs_info->delalloc_roots);
+                       spin_unlock(&fs_info->delalloc_root_lock);
                }
        }
        spin_unlock(&root->delalloc_lock);
@@ -1715,6 +1722,8 @@ static void btrfs_add_delalloc_inodes(struct btrfs_root *root,
 static void btrfs_del_delalloc_inode(struct btrfs_root *root,
                                     struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+
        spin_lock(&root->delalloc_lock);
        if (!list_empty(&BTRFS_I(inode)->delalloc_inodes)) {
                list_del_init(&BTRFS_I(inode)->delalloc_inodes);
@@ -1722,10 +1731,10 @@ static void btrfs_del_delalloc_inode(struct btrfs_root *root,
                          &BTRFS_I(inode)->runtime_flags);
                root->nr_delalloc_inodes--;
                if (!root->nr_delalloc_inodes) {
-                       spin_lock(&root->fs_info->delalloc_root_lock);
+                       spin_lock(&fs_info->delalloc_root_lock);
                        BUG_ON(list_empty(&root->delalloc_root));
                        list_del_init(&root->delalloc_root);
-                       spin_unlock(&root->fs_info->delalloc_root_lock);
+                       spin_unlock(&fs_info->delalloc_root_lock);
                }
        }
        spin_unlock(&root->delalloc_lock);
@@ -1740,6 +1749,8 @@ static void btrfs_set_bit_hook(struct inode *inode,
                               struct extent_state *state, unsigned *bits)
 {
 
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+
        if ((*bits & EXTENT_DEFRAG) && !(*bits & EXTENT_DELALLOC))
                WARN_ON(1);
        /*
@@ -1761,11 +1772,11 @@ static void btrfs_set_bit_hook(struct inode *inode,
                }
 
                /* For sanity tests */
-               if (btrfs_is_testing(root->fs_info))
+               if (btrfs_is_testing(fs_info))
                        return;
 
-               __percpu_counter_add(&root->fs_info->delalloc_bytes, len,
-                                    root->fs_info->delalloc_batch);
+               __percpu_counter_add(&fs_info->delalloc_bytes, len,
+                                    fs_info->delalloc_batch);
                spin_lock(&BTRFS_I(inode)->lock);
                BTRFS_I(inode)->delalloc_bytes += len;
                if (*bits & EXTENT_DEFRAG)
@@ -1784,6 +1795,7 @@ static void btrfs_clear_bit_hook(struct inode *inode,
                                 struct extent_state *state,
                                 unsigned *bits)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        u64 len = state->end + 1 - state->start;
        u64 num_extents = div64_u64(len + BTRFS_MAX_EXTENT_SIZE -1,
                                    BTRFS_MAX_EXTENT_SIZE);
@@ -1816,11 +1828,11 @@ static void btrfs_clear_bit_hook(struct inode *inode,
                 * error.
                 */
                if (*bits & EXTENT_DO_ACCOUNTING &&
-                   root != root->fs_info->tree_root)
+                   root != fs_info->tree_root)
                        btrfs_delalloc_release_metadata(inode, len);
 
                /* For sanity tests. */
-               if (btrfs_is_testing(root->fs_info))
+               if (btrfs_is_testing(fs_info))
                        return;
 
                if (root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID
@@ -1830,8 +1842,8 @@ static void btrfs_clear_bit_hook(struct inode *inode,
                        btrfs_free_reserved_data_space_noquota(inode,
                                        state->start, len);
 
-               __percpu_counter_add(&root->fs_info->delalloc_bytes, -len,
-                                    root->fs_info->delalloc_batch);
+               __percpu_counter_add(&fs_info->delalloc_bytes, -len,
+                                    fs_info->delalloc_batch);
                spin_lock(&BTRFS_I(inode)->lock);
                BTRFS_I(inode)->delalloc_bytes -= len;
                if (do_list && BTRFS_I(inode)->delalloc_bytes == 0 &&
@@ -1854,7 +1866,8 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
                         size_t size, struct bio *bio,
                         unsigned long bio_flags)
 {
-       struct btrfs_root *root = BTRFS_I(page->mapping->host)->root;
+       struct inode *inode = page->mapping->host;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        u64 logical = (u64)bio->bi_iter.bi_sector << 9;
        u64 length = 0;
        u64 map_length;
@@ -1865,8 +1878,8 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
 
        length = bio->bi_iter.bi_size;
        map_length = length;
-       ret = btrfs_map_block(root->fs_info, btrfs_op(bio), logical,
-                             &map_length, NULL, 0);
+       ret = btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,
+                             NULL, 0);
        if (ret < 0)
                return ret;
        if (map_length < length + size)
@@ -1925,6 +1938,7 @@ static int btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
                          int mirror_num, unsigned long bio_flags,
                          u64 bio_offset)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        enum btrfs_wq_endio_type metadata = BTRFS_WQ_ENDIO_DATA;
        int ret = 0;
@@ -1937,7 +1951,7 @@ static int btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
                metadata = BTRFS_WQ_ENDIO_FREE_SPACE;
 
        if (bio_op(bio) != REQ_OP_WRITE) {
-               ret = btrfs_bio_wq_end_io(root->fs_info, bio, metadata);
+               ret = btrfs_bio_wq_end_io(fs_info, bio, metadata);
                if (ret)
                        goto out;
 
@@ -1957,11 +1971,10 @@ static int btrfs_submit_bio_hook(struct inode *inode, struct bio *bio,
                if (root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID)
                        goto mapit;
                /* we're doing a write, do the async checksumming */
-               ret = btrfs_wq_submit_bio(BTRFS_I(inode)->root->fs_info,
-                                  inode, bio, mirror_num,
-                                  bio_flags, bio_offset,
-                                  __btrfs_submit_bio_start,
-                                  __btrfs_submit_bio_done);
+               ret = btrfs_wq_submit_bio(fs_info, inode, bio, mirror_num,
+                                         bio_flags, bio_offset,
+                                         __btrfs_submit_bio_start,
+                                         __btrfs_submit_bio_done);
                goto out;
        } else if (!skip_sum) {
                ret = btrfs_csum_one_bio(root, inode, bio, 0, 0);
@@ -2091,8 +2104,8 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)
 static int btrfs_writepage_start_hook(struct page *page, u64 start, u64 end)
 {
        struct inode *inode = page->mapping->host;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_writepage_fixup *fixup;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
 
        /* this page is properly in the ordered list */
        if (TestClearPagePrivate2(page))
@@ -2110,7 +2123,7 @@ static int btrfs_writepage_start_hook(struct page *page, u64 start, u64 end)
        btrfs_init_work(&fixup->work, btrfs_fixup_helper,
                        btrfs_writepage_fixup_worker, NULL, NULL);
        fixup->page = page;
-       btrfs_queue_work(root->fs_info->fixup_workers, &fixup->work);
+       btrfs_queue_work(fs_info->fixup_workers, &fixup->work);
        return -EBUSY;
 }
 
@@ -2294,7 +2307,6 @@ static noinline int record_one_backref(u64 inum, u64 offset, u64 root_id,
                                       void *ctx)
 {
        struct btrfs_file_extent_item *extent;
-       struct btrfs_fs_info *fs_info;
        struct old_sa_defrag_extent *old = ctx;
        struct new_sa_defrag_extent *new = old->new;
        struct btrfs_path *path = new->path;
@@ -2303,6 +2315,7 @@ static noinline int record_one_backref(u64 inum, u64 offset, u64 root_id,
        struct sa_defrag_extent_backref *backref;
        struct extent_buffer *leaf;
        struct inode *inode = new->inode;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int slot;
        int ret;
        u64 extent_offset;
@@ -2316,7 +2329,6 @@ static noinline int record_one_backref(u64 inum, u64 offset, u64 root_id,
        key.type = BTRFS_ROOT_ITEM_KEY;
        key.offset = (u64)-1;
 
-       fs_info = BTRFS_I(inode)->root->fs_info;
        root = btrfs_read_fs_root_no_name(fs_info, &key);
        if (IS_ERR(root)) {
                if (PTR_ERR(root) == -ENOENT)
@@ -2414,7 +2426,7 @@ static noinline int record_one_backref(u64 inum, u64 offset, u64 root_id,
 static noinline bool record_extent_backrefs(struct btrfs_path *path,
                                   struct new_sa_defrag_extent *new)
 {
-       struct btrfs_fs_info *fs_info = BTRFS_I(new->inode)->root->fs_info;
+       struct btrfs_fs_info *fs_info = btrfs_sb(new->inode->i_sb);
        struct old_sa_defrag_extent *old, *tmp;
        int ret;
 
@@ -2472,13 +2484,12 @@ static noinline int relink_extent_backref(struct btrfs_path *path,
        struct btrfs_file_extent_item *item;
        struct btrfs_ordered_extent *ordered;
        struct btrfs_trans_handle *trans;
-       struct btrfs_fs_info *fs_info;
        struct btrfs_root *root;
        struct btrfs_key key;
        struct extent_buffer *leaf;
        struct old_sa_defrag_extent *old = backref->old;
        struct new_sa_defrag_extent *new = old->new;
-       struct inode *src_inode = new->inode;
+       struct btrfs_fs_info *fs_info = btrfs_sb(new->inode->i_sb);
        struct inode *inode;
        struct extent_state *cached = NULL;
        int ret = 0;
@@ -2499,7 +2510,6 @@ static noinline int relink_extent_backref(struct btrfs_path *path,
        key.type = BTRFS_ROOT_ITEM_KEY;
        key.offset = (u64)-1;
 
-       fs_info = BTRFS_I(src_inode)->root->fs_info;
        index = srcu_read_lock(&fs_info->subvol_srcu);
 
        root = btrfs_read_fs_root_no_name(fs_info, &key);
@@ -2680,6 +2690,7 @@ static void free_sa_defrag_extent(struct new_sa_defrag_extent *new)
 
 static void relink_file_extents(struct new_sa_defrag_extent *new)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(new->inode->i_sb);
        struct btrfs_path *path;
        struct sa_defrag_extent_backref *backref;
        struct sa_defrag_extent_backref *prev = NULL;
@@ -2726,14 +2737,15 @@ static void relink_file_extents(struct new_sa_defrag_extent *new)
 out:
        free_sa_defrag_extent(new);
 
-       atomic_dec(&root->fs_info->defrag_running);
-       wake_up(&root->fs_info->transaction_wait);
+       atomic_dec(&fs_info->defrag_running);
+       wake_up(&fs_info->transaction_wait);
 }
 
 static struct new_sa_defrag_extent *
 record_old_file_extents(struct inode *inode,
                        struct btrfs_ordered_extent *ordered)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_path *path;
        struct btrfs_key key;
@@ -2832,7 +2844,7 @@ record_old_file_extents(struct inode *inode,
        }
 
        btrfs_free_path(path);
-       atomic_inc(&root->fs_info->defrag_running);
+       atomic_inc(&fs_info->defrag_running);
 
        return new;
 
@@ -2846,9 +2858,10 @@ record_old_file_extents(struct inode *inode,
 static void btrfs_release_delalloc_bytes(struct btrfs_root *root,
                                         u64 start, u64 len)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_group_cache *cache;
 
-       cache = btrfs_lookup_block_group(root->fs_info, start);
+       cache = btrfs_lookup_block_group(fs_info, start);
        ASSERT(cache);
 
        spin_lock(&cache->lock);
@@ -2865,6 +2878,7 @@ static void btrfs_release_delalloc_bytes(struct btrfs_root *root,
 static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
 {
        struct inode *inode = ordered_extent->inode;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans = NULL;
        struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
@@ -2915,7 +2929,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                        trans = NULL;
                        goto out;
                }
-               trans->block_rsv = &root->fs_info->delalloc_block_rsv;
+               trans->block_rsv = &fs_info->delalloc_block_rsv;
                ret = btrfs_update_inode_fallback(trans, root, inode);
                if (ret) /* -ENOMEM or corruption */
                        btrfs_abort_transaction(trans, ret);
@@ -2950,7 +2964,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                goto out_unlock;
        }
 
-       trans->block_rsv = &root->fs_info->delalloc_block_rsv;
+       trans->block_rsv = &fs_info->delalloc_block_rsv;
 
        if (test_bit(BTRFS_ORDERED_COMPRESSED, &ordered_extent->flags))
                compress_type = ordered_extent->compress_type;
@@ -2961,7 +2975,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                                                ordered_extent->file_offset +
                                                logical_len);
        } else {
-               BUG_ON(root == root->fs_info->tree_root);
+               BUG_ON(root == fs_info->tree_root);
                ret = insert_reserved_file_extent(trans, inode,
                                                ordered_extent->file_offset,
                                                ordered_extent->start,
@@ -2997,7 +3011,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                             ordered_extent->file_offset +
                             ordered_extent->len - 1, &cached_state, GFP_NOFS);
 out:
-       if (root != root->fs_info->tree_root)
+       if (root != fs_info->tree_root)
                btrfs_delalloc_release_metadata(inode, ordered_extent->len);
        if (trans)
                btrfs_end_transaction(trans, root);
@@ -3039,7 +3053,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
        if (new) {
                if (ret) {
                        free_sa_defrag_extent(new);
-                       atomic_dec(&root->fs_info->defrag_running);
+                       atomic_dec(&fs_info->defrag_running);
                } else {
                        relink_file_extents(new);
                }
@@ -3064,7 +3078,7 @@ static int btrfs_writepage_end_io_hook(struct page *page, u64 start, u64 end,
                                struct extent_state *state, int uptodate)
 {
        struct inode *inode = page->mapping->host;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ordered_extent *ordered_extent = NULL;
        struct btrfs_workqueue *wq;
        btrfs_work_func_t func;
@@ -3077,10 +3091,10 @@ static int btrfs_writepage_end_io_hook(struct page *page, u64 start, u64 end,
                return 0;
 
        if (btrfs_is_free_space_inode(inode)) {
-               wq = root->fs_info->endio_freespace_worker;
+               wq = fs_info->endio_freespace_worker;
                func = btrfs_freespace_write_helper;
        } else {
-               wq = root->fs_info->endio_write_workers;
+               wq = fs_info->endio_write_workers;
                func = btrfs_endio_write_helper;
        }
 
@@ -3157,7 +3171,7 @@ static int btrfs_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
 
 void btrfs_add_delayed_iput(struct inode *inode)
 {
-       struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_inode *binode = BTRFS_I(inode);
 
        if (atomic_add_unless(&inode->i_count, -1, 1))
@@ -3205,6 +3219,7 @@ void btrfs_run_delayed_iputs(struct btrfs_root *root)
 void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_block_rsv *block_rsv;
        int ret;
 
@@ -3229,7 +3244,7 @@ void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
 
        if (test_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED, &root->state) &&
            btrfs_root_refs(&root->root_item) > 0) {
-               ret = btrfs_del_orphan_item(trans, root->fs_info->tree_root,
+               ret = btrfs_del_orphan_item(trans, fs_info->tree_root,
                                            root->root_key.objectid);
                if (ret)
                        btrfs_abort_transaction(trans, ret);
@@ -3253,6 +3268,7 @@ void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
  */
 int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_block_rsv *block_rsv = NULL;
        int reserve = 0;
@@ -3332,7 +3348,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
 
        /* insert an orphan item to track subvolume contains orphan files */
        if (insert >= 2) {
-               ret = btrfs_insert_orphan_item(trans, root->fs_info->tree_root,
+               ret = btrfs_insert_orphan_item(trans, fs_info->tree_root,
                                               root->root_key.objectid);
                if (ret && ret != -EEXIST) {
                        btrfs_abort_transaction(trans, ret);
@@ -3383,6 +3399,7 @@ static int btrfs_orphan_del(struct btrfs_trans_handle *trans,
  */
 int btrfs_orphan_cleanup(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct extent_buffer *leaf;
        struct btrfs_key key, found_key;
@@ -3442,8 +3459,8 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                 */
 
                if (found_key.offset == last_objectid) {
-                       btrfs_err(root->fs_info,
-                               "Error removing orphan entry, stopping orphan cleanup");
+                       btrfs_err(fs_info,
+                                 "Error removing orphan entry, stopping orphan cleanup");
                        ret = -EINVAL;
                        goto out;
                }
@@ -3453,12 +3470,12 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                found_key.objectid = found_key.offset;
                found_key.type = BTRFS_INODE_ITEM_KEY;
                found_key.offset = 0;
-               inode = btrfs_iget(root->fs_info->sb, &found_key, root, NULL);
+               inode = btrfs_iget(fs_info->sb, &found_key, root, NULL);
                ret = PTR_ERR_OR_ZERO(inode);
                if (ret && ret != -ENOENT)
                        goto out;
 
-               if (ret == -ENOENT && root == root->fs_info->tree_root) {
+               if (ret == -ENOENT && root == fs_info->tree_root) {
                        struct btrfs_root *dead_root;
                        struct btrfs_fs_info *fs_info = root->fs_info;
                        int is_dead_root = 0;
@@ -3500,8 +3517,8 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                                ret = PTR_ERR(trans);
                                goto out;
                        }
-                       btrfs_debug(root->fs_info, "auto deleting %Lu",
-                               found_key.objectid);
+                       btrfs_debug(fs_info, "auto deleting %Lu",
+                                   found_key.objectid);
                        ret = btrfs_del_orphan_item(trans, root,
                                                    found_key.objectid);
                        btrfs_end_transaction(trans, root);
@@ -3569,14 +3586,13 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
        }
 
        if (nr_unlink)
-               btrfs_debug(root->fs_info, "unlinked %d orphans", nr_unlink);
+               btrfs_debug(fs_info, "unlinked %d orphans", nr_unlink);
        if (nr_truncate)
-               btrfs_debug(root->fs_info, "truncated %d orphans", nr_truncate);
+               btrfs_debug(fs_info, "truncated %d orphans", nr_truncate);
 
 out:
        if (ret)
-               btrfs_err(root->fs_info,
-                       "could not do orphan cleanup %d", ret);
+               btrfs_err(fs_info, "could not do orphan cleanup %d", ret);
        btrfs_free_path(path);
        return ret;
 }
@@ -3655,6 +3671,7 @@ static noinline int acls_after_inode_item(struct extent_buffer *leaf,
  */
 static int btrfs_read_locked_inode(struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_path *path;
        struct extent_buffer *leaf;
        struct btrfs_inode_item *inode_item;
@@ -3735,7 +3752,7 @@ static int btrfs_read_locked_inode(struct inode *inode)
         * This is required for both inode re-read from disk and delayed inode
         * in delayed_nodes_tree.
         */
-       if (BTRFS_I(inode)->last_trans == root->fs_info->generation)
+       if (BTRFS_I(inode)->last_trans == fs_info->generation)
                set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
                        &BTRFS_I(inode)->runtime_flags);
 
@@ -3801,7 +3818,7 @@ static int btrfs_read_locked_inode(struct inode *inode)
                path->slots[0] = first_xattr_slot;
                ret = btrfs_load_inode_props(inode, path);
                if (ret)
-                       btrfs_err(root->fs_info,
+                       btrfs_err(fs_info,
                                  "error loading props for ino %llu (root %llu): %d",
                                  btrfs_ino(inode),
                                  root->root_key.objectid, ret);
@@ -3820,7 +3837,7 @@ static int btrfs_read_locked_inode(struct inode *inode)
                break;
        case S_IFDIR:
                inode->i_fop = &btrfs_dir_file_operations;
-               if (root == root->fs_info->tree_root)
+               if (root == fs_info->tree_root)
                        inode->i_op = &btrfs_dir_ro_inode_operations;
                else
                        inode->i_op = &btrfs_dir_inode_operations;
@@ -3938,6 +3955,7 @@ static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,
 noinline int btrfs_update_inode(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root, struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
 
        /*
@@ -3949,7 +3967,7 @@ noinline int btrfs_update_inode(struct btrfs_trans_handle *trans,
         */
        if (!btrfs_is_free_space_inode(inode)
            && root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID
-           && !test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags)) {
+           && !test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) {
                btrfs_update_root_times(trans, root);
 
                ret = btrfs_delayed_update_inode(trans, root, inode);
@@ -3983,6 +4001,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
                                struct inode *dir, struct inode *inode,
                                const char *name, int name_len)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        int ret = 0;
        struct extent_buffer *leaf;
@@ -4037,7 +4056,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
        ret = btrfs_del_inode_ref(trans, root, name, name_len, ino,
                                  dir_ino, &index);
        if (ret) {
-               btrfs_info(root->fs_info,
+               btrfs_info(fs_info,
                        "failed to delete reference to %.*s, inode %llu parent %llu",
                        name_len, name, ino, dir_ino);
                btrfs_abort_transaction(trans, ret);
@@ -4149,6 +4168,7 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
                        struct inode *dir, u64 objectid,
                        const char *name, int name_len)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct extent_buffer *leaf;
        struct btrfs_dir_item *di;
@@ -4181,9 +4201,9 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
        }
        btrfs_release_path(path);
 
-       ret = btrfs_del_root_ref(trans, root->fs_info,
-                                objectid, root->root_key.objectid,
-                                dir_ino, &index, name, name_len);
+       ret = btrfs_del_root_ref(trans, fs_info, objectid,
+                                root->root_key.objectid, dir_ino,
+                                &index, name, name_len);
        if (ret < 0) {
                if (ret != -ENOENT) {
                        btrfs_abort_transaction(trans, ret);
@@ -4285,6 +4305,7 @@ static int truncate_space_check(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root,
                                u64 bytes_deleted)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
 
        /*
@@ -4292,11 +4313,11 @@ static int truncate_space_check(struct btrfs_trans_handle *trans,
         * intend to use this reservation at all.
         */
        bytes_deleted = btrfs_csum_bytes_to_leaves(root, bytes_deleted);
-       bytes_deleted *= root->fs_info->nodesize;
-       ret = btrfs_block_rsv_add(root, &root->fs_info->trans_block_rsv,
+       bytes_deleted *= fs_info->nodesize;
+       ret = btrfs_block_rsv_add(root, &fs_info->trans_block_rsv,
                                  bytes_deleted, BTRFS_RESERVE_NO_FLUSH);
        if (!ret) {
-               trace_btrfs_space_reservation(root->fs_info, "transaction",
+               trace_btrfs_space_reservation(fs_info, "transaction",
                                              trans->transid,
                                              bytes_deleted, 1);
                trans->bytes_reserved += bytes_deleted;
@@ -4363,6 +4384,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
                               struct inode *inode,
                               u64 new_size, u32 min_type)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct extent_buffer *leaf;
        struct btrfs_file_extent_item *fi;
@@ -4408,9 +4430,9 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
         * extent just the way it is.
         */
        if (test_bit(BTRFS_ROOT_REF_COWS, &root->state) ||
-           root == root->fs_info->tree_root)
+           root == fs_info->tree_root)
                btrfs_drop_extent_cache(inode, ALIGN(new_size,
-                                       root->fs_info->sectorsize),
+                                       fs_info->sectorsize),
                                        (u64)-1, 0);
 
        /*
@@ -4510,7 +4532,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
                                        btrfs_file_extent_num_bytes(leaf, fi);
                                extent_num_bytes = ALIGN(new_size -
                                                found_key.offset,
-                                               root->fs_info->sectorsize);
+                                               fs_info->sectorsize);
                                btrfs_set_file_extent_num_bytes(leaf, fi,
                                                         extent_num_bytes);
                                num_dec = (orig_num_bytes -
@@ -4597,7 +4619,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
 
                if (found_extent &&
                    (test_bit(BTRFS_ROOT_REF_COWS, &root->state) ||
-                    root == root->fs_info->tree_root)) {
+                    root == fs_info->tree_root)) {
                        btrfs_set_path_blocking(path);
                        bytes_deleted += extent_num_bytes;
                        ret = btrfs_free_extent(trans, root, extent_start,
@@ -4699,13 +4721,13 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
 int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,
                        int front)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct address_space *mapping = inode->i_mapping;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
        struct btrfs_ordered_extent *ordered;
        struct extent_state *cached_state = NULL;
        char *kaddr;
-       u32 blocksize = root->fs_info->sectorsize;
+       u32 blocksize = fs_info->sectorsize;
        pgoff_t index = from >> PAGE_SHIFT;
        unsigned offset = from & (blocksize - 1);
        struct page *page;
@@ -4809,6 +4831,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,
 static int maybe_insert_hole(struct btrfs_root *root, struct inode *inode,
                             u64 offset, u64 len)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_trans_handle *trans;
        int ret;
 
@@ -4816,8 +4839,8 @@ static int maybe_insert_hole(struct btrfs_root *root, struct inode *inode,
         * Still need to make sure the inode looks like it's been updated so
         * that any holes get logged if we fsync.
         */
-       if (btrfs_fs_incompat(root->fs_info, NO_HOLES)) {
-               BTRFS_I(inode)->last_trans = root->fs_info->generation;
+       if (btrfs_fs_incompat(fs_info, NO_HOLES)) {
+               BTRFS_I(inode)->last_trans = fs_info->generation;
                BTRFS_I(inode)->last_sub_trans = root->log_transid;
                BTRFS_I(inode)->last_log_commit = root->last_log_commit;
                return 0;
@@ -4857,13 +4880,14 @@ static int maybe_insert_hole(struct btrfs_root *root, struct inode *inode,
  */
 int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
        struct extent_map *em = NULL;
        struct extent_state *cached_state = NULL;
        struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
-       u64 hole_start = ALIGN(oldsize, root->fs_info->sectorsize);
-       u64 block_end = ALIGN(size, root->fs_info->sectorsize);
+       u64 hole_start = ALIGN(oldsize, fs_info->sectorsize);
+       u64 block_end = ALIGN(size, fs_info->sectorsize);
        u64 last_byte;
        u64 cur_offset;
        u64 hole_size;
@@ -4906,7 +4930,7 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
                        break;
                }
                last_byte = min(extent_map_end(em), block_end);
-               last_byte = ALIGN(last_byte, root->fs_info->sectorsize);
+               last_byte = ALIGN(last_byte, fs_info->sectorsize);
                if (!test_bit(EXTENT_FLAG_PREALLOC, &em->flags)) {
                        struct extent_map *hole_em;
                        hole_size = last_byte - cur_offset;
@@ -4931,9 +4955,9 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
                        hole_em->block_len = 0;
                        hole_em->orig_block_len = 0;
                        hole_em->ram_bytes = hole_size;
-                       hole_em->bdev = root->fs_info->fs_devices->latest_bdev;
+                       hole_em->bdev = fs_info->fs_devices->latest_bdev;
                        hole_em->compress_type = BTRFS_COMPRESS_NONE;
-                       hole_em->generation = root->fs_info->generation;
+                       hole_em->generation = fs_info->generation;
 
                        while (1) {
                                write_lock(&em_tree->lock);
@@ -5203,6 +5227,7 @@ static void evict_inode_truncate_pages(struct inode *inode)
 
 void btrfs_evict_inode(struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_trans_handle *trans;
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_block_rsv *rsv, *global_rsv;
@@ -5217,7 +5242,7 @@ void btrfs_evict_inode(struct inode *inode)
                return;
        }
 
-       min_size = btrfs_calc_trunc_metadata_size(root->fs_info, 1);
+       min_size = btrfs_calc_trunc_metadata_size(fs_info, 1);
 
        evict_inode_truncate_pages(inode);
 
@@ -5237,7 +5262,7 @@ void btrfs_evict_inode(struct inode *inode)
 
        btrfs_free_io_failure_record(inode, 0, (u64)-1);
 
-       if (test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags)) {
+       if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) {
                BUG_ON(test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
                                 &BTRFS_I(inode)->runtime_flags));
                goto no_delete;
@@ -5262,7 +5287,7 @@ void btrfs_evict_inode(struct inode *inode)
        }
        rsv->size = min_size;
        rsv->failfast = 1;
-       global_rsv = &root->fs_info->global_block_rsv;
+       global_rsv = &fs_info->global_block_rsv;
 
        btrfs_i_size_write(inode, 0);
 
@@ -5296,9 +5321,9 @@ void btrfs_evict_inode(struct inode *inode)
                 * steal_from_global == 3: abandon all hope!
                 */
                if (steal_from_global > 2) {
-                       btrfs_warn(root->fs_info,
-                               "Could not get space for a delete, will truncate on mount %d",
-                               ret);
+                       btrfs_warn(fs_info,
+                                  "Could not get space for a delete, will truncate on mount %d",
+                                  ret);
                        btrfs_orphan_del(NULL, inode);
                        btrfs_free_block_rsv(root, rsv);
                        goto no_delete;
@@ -5347,7 +5372,7 @@ void btrfs_evict_inode(struct inode *inode)
                if (ret != -ENOSPC && ret != -EAGAIN)
                        break;
 
-               trans->block_rsv = &root->fs_info->trans_block_rsv;
+               trans->block_rsv = &fs_info->trans_block_rsv;
                btrfs_end_transaction(trans, root);
                trans = NULL;
                btrfs_btree_balance_dirty(root);
@@ -5366,8 +5391,8 @@ void btrfs_evict_inode(struct inode *inode)
                btrfs_orphan_del(NULL, inode);
        }
 
-       trans->block_rsv = &root->fs_info->trans_block_rsv;
-       if (!(root == root->fs_info->tree_root ||
+       trans->block_rsv = &fs_info->trans_block_rsv;
+       if (!(root == fs_info->tree_root ||
              root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID))
                btrfs_return_ino(root, btrfs_ino(inode));
 
@@ -5424,6 +5449,7 @@ static int fixup_tree_root_location(struct btrfs_root *root,
                                    struct btrfs_key *location,
                                    struct btrfs_root **sub_root)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);
        struct btrfs_path *path;
        struct btrfs_root *new_root;
        struct btrfs_root_ref *ref;
@@ -5443,8 +5469,7 @@ static int fixup_tree_root_location(struct btrfs_root *root,
        key.type = BTRFS_ROOT_REF_KEY;
        key.offset = location->objectid;
 
-       ret = btrfs_search_slot(NULL, root->fs_info->tree_root, &key, path,
-                               0, 0);
+       ret = btrfs_search_slot(NULL, fs_info->tree_root, &key, path, 0, 0);
        if (ret) {
                if (ret < 0)
                        err = ret;
@@ -5465,7 +5490,7 @@ static int fixup_tree_root_location(struct btrfs_root *root,
 
        btrfs_release_path(path);
 
-       new_root = btrfs_read_fs_root_no_name(root->fs_info, location);
+       new_root = btrfs_read_fs_root_no_name(fs_info, location);
        if (IS_ERR(new_root)) {
                err = PTR_ERR(new_root);
                goto out;
@@ -5519,6 +5544,7 @@ static void inode_tree_add(struct inode *inode)
 
 static void inode_tree_del(struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        int empty = 0;
 
@@ -5531,7 +5557,7 @@ static void inode_tree_del(struct inode *inode)
        spin_unlock(&root->inode_lock);
 
        if (empty && btrfs_root_refs(&root->root_item) == 0) {
-               synchronize_srcu(&root->fs_info->subvol_srcu);
+               synchronize_srcu(&fs_info->subvol_srcu);
                spin_lock(&root->inode_lock);
                empty = RB_EMPTY_ROOT(&root->inode_tree);
                spin_unlock(&root->inode_lock);
@@ -5542,13 +5568,14 @@ static void inode_tree_del(struct inode *inode)
 
 void btrfs_invalidate_inodes(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *node;
        struct rb_node *prev;
        struct btrfs_inode *entry;
        struct inode *inode;
        u64 objectid = 0;
 
-       if (!test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))
+       if (!test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
                WARN_ON(btrfs_root_refs(&root->root_item) != 0);
 
        spin_lock(&root->inode_lock);
@@ -5696,6 +5723,7 @@ static struct inode *new_simple_dir(struct super_block *s,
 
 struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);
        struct inode *inode;
        struct btrfs_root *root = BTRFS_I(dir)->root;
        struct btrfs_root *sub_root = root;
@@ -5720,7 +5748,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
 
        BUG_ON(location.type != BTRFS_ROOT_ITEM_KEY);
 
-       index = srcu_read_lock(&root->fs_info->subvol_srcu);
+       index = srcu_read_lock(&fs_info->subvol_srcu);
        ret = fixup_tree_root_location(root, dir, dentry,
                                       &location, &sub_root);
        if (ret < 0) {
@@ -5731,13 +5759,13 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
        } else {
                inode = btrfs_iget(dir->i_sb, &location, sub_root, NULL);
        }
-       srcu_read_unlock(&root->fs_info->subvol_srcu, index);
+       srcu_read_unlock(&fs_info->subvol_srcu, index);
 
        if (!IS_ERR(inode) && root != sub_root) {
-               down_read(&root->fs_info->cleanup_work_sem);
+               down_read(&fs_info->cleanup_work_sem);
                if (!(inode->i_sb->s_flags & MS_RDONLY))
                        ret = btrfs_orphan_cleanup(sub_root);
-               up_read(&root->fs_info->cleanup_work_sem);
+               up_read(&fs_info->cleanup_work_sem);
                if (ret) {
                        iput(inode);
                        inode = ERR_PTR(ret);
@@ -6109,6 +6137,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
                                     u64 ref_objectid, u64 objectid,
                                     umode_t mode, u64 *index)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct inode *inode;
        struct btrfs_inode_item *inode_item;
        struct btrfs_key *location;
@@ -6124,7 +6153,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
        if (!path)
                return ERR_PTR(-ENOMEM);
 
-       inode = new_inode(root->fs_info->sb);
+       inode = new_inode(fs_info->sb);
        if (!inode) {
                btrfs_free_path(path);
                return ERR_PTR(-ENOMEM);
@@ -6237,9 +6266,9 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
        btrfs_inherit_iflags(inode, dir);
 
        if (S_ISREG(mode)) {
-               if (btrfs_test_opt(root->fs_info, NODATASUM))
+               if (btrfs_test_opt(fs_info, NODATASUM))
                        BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;
-               if (btrfs_test_opt(root->fs_info, NODATACOW))
+               if (btrfs_test_opt(fs_info, NODATACOW))
                        BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW |
                                BTRFS_INODE_NODATASUM;
        }
@@ -6253,7 +6282,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 
        ret = btrfs_inode_inherit_props(trans, inode, dir);
        if (ret)
-               btrfs_err(root->fs_info,
+               btrfs_err(fs_info,
                          "error inheriting props for ino %llu (root %llu): %d",
                          btrfs_ino(inode), root->root_key.objectid, ret);
 
@@ -6284,6 +6313,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
                   struct inode *parent_inode, struct inode *inode,
                   const char *name, int name_len, int add_backref, u64 index)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int ret = 0;
        struct btrfs_key key;
        struct btrfs_root *root = BTRFS_I(parent_inode)->root;
@@ -6299,9 +6329,9 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
        }
 
        if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {
-               ret = btrfs_add_root_ref(trans, root->fs_info,
-                                        key.objectid, root->root_key.objectid,
-                                        parent_ino, index, name, name_len);
+               ret = btrfs_add_root_ref(trans, fs_info, key.objectid,
+                                        root->root_key.objectid, parent_ino,
+                                        index, name, name_len);
        } else if (add_backref) {
                ret = btrfs_insert_inode_ref(trans, root, name, name_len, ino,
                                             parent_ino, index);
@@ -6335,9 +6365,9 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
        if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {
                u64 local_index;
                int err;
-               err = btrfs_del_root_ref(trans, root->fs_info,
-                                key.objectid, root->root_key.objectid,
-                                parent_ino, &local_index, name, name_len);
+               err = btrfs_del_root_ref(trans, fs_info, key.objectid,
+                                        root->root_key.objectid, parent_ino,
+                                        &local_index, name, name_len);
 
        } else if (add_backref) {
                u64 local_index;
@@ -6761,6 +6791,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
                                    size_t pg_offset, u64 start, u64 len,
                                    int create)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int ret;
        int err = 0;
        u64 extent_start = 0;
@@ -6782,7 +6813,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
        read_lock(&em_tree->lock);
        em = lookup_extent_mapping(em_tree, start, len);
        if (em)
-               em->bdev = root->fs_info->fs_devices->latest_bdev;
+               em->bdev = fs_info->fs_devices->latest_bdev;
        read_unlock(&em_tree->lock);
 
        if (em) {
@@ -6798,7 +6829,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
                err = -ENOMEM;
                goto out;
        }
-       em->bdev = root->fs_info->fs_devices->latest_bdev;
+       em->bdev = fs_info->fs_devices->latest_bdev;
        em->start = EXTENT_MAP_HOLE;
        em->orig_start = EXTENT_MAP_HOLE;
        em->len = (u64)-1;
@@ -6858,7 +6889,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
                size_t size;
                size = btrfs_file_extent_inline_len(leaf, path->slots[0], item);
                extent_end = ALIGN(extent_start + size,
-                                  root->fs_info->sectorsize);
+                                  fs_info->sectorsize);
        }
 next:
        if (start >= extent_end) {
@@ -6907,7 +6938,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
                copy_size = min_t(u64, PAGE_SIZE - pg_offset,
                                  size - extent_offset);
                em->start = extent_start + extent_offset;
-               em->len = ALIGN(copy_size, root->fs_info->sectorsize);
+               em->len = ALIGN(copy_size, fs_info->sectorsize);
                em->orig_block_len = em->len;
                em->orig_start = em->start;
                ptr = btrfs_file_extent_inline_start(item) + extent_offset;
@@ -6966,7 +6997,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
 insert:
        btrfs_release_path(path);
        if (em->start > start || extent_map_end(em) <= start) {
-               btrfs_err(root->fs_info,
+               btrfs_err(fs_info,
                          "bad extent! em: [%llu %llu] passed [%llu %llu]",
                          em->start, em->len, start, len);
                err = -EIO;
@@ -7206,6 +7237,7 @@ static struct extent_map *btrfs_create_dio_extent(struct inode *inode,
 static struct extent_map *btrfs_new_extent_direct(struct inode *inode,
                                                  u64 start, u64 len)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_map *em;
        struct btrfs_key ins;
@@ -7213,7 +7245,7 @@ static struct extent_map *btrfs_new_extent_direct(struct inode *inode,
        int ret;
 
        alloc_hint = get_extent_allocation_hint(inode, start, len);
-       ret = btrfs_reserve_extent(root, len, len, root->fs_info->sectorsize,
+       ret = btrfs_reserve_extent(root, len, len, fs_info->sectorsize,
                                   0, alloc_hint, &ins, 1, 1);
        if (ret)
                return ERR_PTR(ret);
@@ -7221,7 +7253,7 @@ static struct extent_map *btrfs_new_extent_direct(struct inode *inode,
        em = btrfs_create_dio_extent(inode, start, ins.offset, start,
                                     ins.objectid, ins.offset, ins.offset,
                                     ins.offset, 0);
-       btrfs_dec_block_group_reservations(root->fs_info, ins.objectid);
+       btrfs_dec_block_group_reservations(fs_info, ins.objectid);
        if (IS_ERR(em))
                btrfs_free_reserved_extent(root, ins.objectid, ins.offset, 1);
 
@@ -7596,8 +7628,8 @@ static void adjust_dio_outstanding_extents(struct inode *inode,
 static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
                                   struct buffer_head *bh_result, int create)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct extent_map *em;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct extent_state *cached_state = NULL;
        struct btrfs_dio_data *dio_data = NULL;
        u64 start = iblock << inode->i_blkbits;
@@ -7609,7 +7641,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
        if (create)
                unlock_bits |= EXTENT_DIRTY;
        else
-               len = min_t(u64, len, root->fs_info->sectorsize);
+               len = min_t(u64, len, fs_info->sectorsize);
 
        lockstart = start;
        lockend = start + len - 1;
@@ -7698,14 +7730,14 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
 
                if (can_nocow_extent(inode, start, &len, &orig_start,
                                     &orig_block_len, &ram_bytes) == 1 &&
-                   btrfs_inc_nocow_writers(root->fs_info, block_start)) {
+                   btrfs_inc_nocow_writers(fs_info, block_start)) {
                        struct extent_map *em2;
 
                        em2 = btrfs_create_dio_extent(inode, start, len,
                                                      orig_start, block_start,
                                                      len, orig_block_len,
                                                      ram_bytes, type);
-                       btrfs_dec_nocow_writers(root->fs_info, block_start);
+                       btrfs_dec_nocow_writers(fs_info, block_start);
                        if (type == BTRFS_ORDERED_PREALLOC) {
                                free_extent_map(em);
                                em = em2;
@@ -7731,7 +7763,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
         * give it a chance to use preallocated space.
         */
        len = min_t(u64, bh_result->b_size, em->len - (start - em->start));
-       len = ALIGN(len, root->fs_info->sectorsize);
+       len = ALIGN(len, fs_info->sectorsize);
        free_extent_map(em);
        em = btrfs_new_extent_direct(inode, start, len);
        if (IS_ERR(em)) {
@@ -8142,7 +8174,7 @@ static void btrfs_endio_direct_write_update_ordered(struct inode *inode,
                                                    const u64 bytes,
                                                    const int uptodate)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ordered_extent *ordered = NULL;
        u64 ordered_offset = offset;
        u64 ordered_bytes = bytes;
@@ -8158,8 +8190,7 @@ static void btrfs_endio_direct_write_update_ordered(struct inode *inode,
 
        btrfs_init_work(&ordered->work, btrfs_endio_write_helper,
                        finish_ordered_fn, NULL, NULL);
-       btrfs_queue_work(root->fs_info->endio_write_workers,
-                        &ordered->work);
+       btrfs_queue_work(fs_info->endio_write_workers, &ordered->work);
 out_test:
        /*
         * our bio might span multiple ordered extents.  If we haven't
@@ -8285,6 +8316,7 @@ static inline int __btrfs_submit_dio_bio(struct bio *bio, struct inode *inode,
                                         u64 file_offset, int skip_sum,
                                         int async_submit)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_dio_private *dip = bio->bi_private;
        bool write = bio_op(bio) == REQ_OP_WRITE;
        struct btrfs_root *root = BTRFS_I(inode)->root;
@@ -8296,8 +8328,7 @@ static inline int __btrfs_submit_dio_bio(struct bio *bio, struct inode *inode,
        bio_get(bio);
 
        if (!write) {
-               ret = btrfs_bio_wq_end_io(root->fs_info, bio,
-                               BTRFS_WQ_ENDIO_DATA);
+               ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA);
                if (ret)
                        goto err;
        }
@@ -8306,10 +8337,10 @@ static inline int __btrfs_submit_dio_bio(struct bio *bio, struct inode *inode,
                goto map;
 
        if (write && async_submit) {
-               ret = btrfs_wq_submit_bio(root->fs_info,
-                                  inode, bio, 0, 0, file_offset,
-                                  __btrfs_submit_bio_start_direct_io,
-                                  __btrfs_submit_bio_done);
+               ret = btrfs_wq_submit_bio(fs_info, inode, bio, 0, 0,
+                                         file_offset,
+                                         __btrfs_submit_bio_start_direct_io,
+                                         __btrfs_submit_bio_done);
                goto err;
        } else if (write) {
                /*
@@ -8336,6 +8367,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip,
                                    int skip_sum)
 {
        struct inode *inode = dip->inode;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct bio *bio;
        struct bio *orig_bio = dip->orig_bio;
@@ -8344,15 +8376,15 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip,
        u64 file_offset = dip->logical_offset;
        u64 submit_len = 0;
        u64 map_length;
-       u32 blocksize = root->fs_info->sectorsize;
+       u32 blocksize = fs_info->sectorsize;
        int async_submit = 0;
        int nr_sectors;
        int ret;
        int i, j;
 
        map_length = orig_bio->bi_iter.bi_size;
-       ret = btrfs_map_block(root->fs_info, btrfs_op(orig_bio),
-                             start_sector << 9, &map_length, NULL, 0);
+       ret = btrfs_map_block(fs_info, btrfs_op(orig_bio), start_sector << 9,
+                             &map_length, NULL, 0);
        if (ret)
                return -EIO;
 
@@ -8379,7 +8411,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip,
        atomic_inc(&dip->pending_bios);
 
        bio_for_each_segment_all(bvec, orig_bio, j) {
-               nr_sectors = BTRFS_BYTES_TO_BLKS(root->fs_info, bvec->bv_len);
+               nr_sectors = BTRFS_BYTES_TO_BLKS(fs_info, bvec->bv_len);
                i = 0;
 next_block:
                if (unlikely(map_length < submit_len + blocksize ||
@@ -8417,7 +8449,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip,
                        btrfs_io_bio(bio)->logical = file_offset;
 
                        map_length = orig_bio->bi_iter.bi_size;
-                       ret = btrfs_map_block(root->fs_info, btrfs_op(orig_bio),
+                       ret = btrfs_map_block(fs_info, btrfs_op(orig_bio),
                                              start_sector << 9,
                                              &map_length, NULL, 0);
                        if (ret) {
@@ -8566,9 +8598,10 @@ static void btrfs_submit_direct(struct bio *dio_bio, struct inode *inode,
 static ssize_t check_direct_IO(struct btrfs_root *root, struct kiocb *iocb,
                        const struct iov_iter *iter, loff_t offset)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int seg;
        int i;
-       unsigned int blocksize_mask = root->fs_info->sectorsize - 1;
+       unsigned int blocksize_mask = fs_info->sectorsize - 1;
        ssize_t retval = -EINVAL;
 
        if (offset & blocksize_mask)
@@ -8600,7 +8633,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 {
        struct file *file = iocb->ki_filp;
        struct inode *inode = file->f_mapping->host;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_dio_data dio_data = { 0 };
        loff_t offset = iocb->ki_pos;
        size_t count = 0;
@@ -8650,7 +8683,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
                 * originally calculated.  Abuse current->journal_info for this.
                 */
                dio_data.reserve = round_up(count,
-                                           root->fs_info->sectorsize);
+                                           fs_info->sectorsize);
                dio_data.unsubmitted_oe_range_start = (u64)offset;
                dio_data.unsubmitted_oe_range_end = (u64)offset;
                current->journal_info = &dio_data;
@@ -8662,7 +8695,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
        }
 
        ret = __blockdev_direct_IO(iocb, inode,
-                                  BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev,
+                                  fs_info->fs_devices->latest_bdev,
                                   iter, btrfs_get_blocks_direct, NULL,
                                   btrfs_submit_direct, flags);
        if (iov_iter_rw(iter) == WRITE) {
@@ -8921,7 +8954,7 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        struct page *page = vmf->page;
        struct inode *inode = file_inode(vma->vm_file);
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
        struct btrfs_ordered_extent *ordered;
        struct extent_state *cached_state = NULL;
@@ -8997,7 +9030,7 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 
        if (page->index == ((size - 1) >> PAGE_SHIFT)) {
                reserved_space = round_up(size - page_start,
-                                         root->fs_info->sectorsize);
+                                         fs_info->sectorsize);
                if (reserved_space < PAGE_SIZE) {
                        end = page_start + reserved_space - 1;
                        spin_lock(&BTRFS_I(inode)->lock);
@@ -9046,7 +9079,7 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
        set_page_dirty(page);
        SetPageUptodate(page);
 
-       BTRFS_I(inode)->last_trans = root->fs_info->generation;
+       BTRFS_I(inode)->last_trans = fs_info->generation;
        BTRFS_I(inode)->last_sub_trans = BTRFS_I(inode)->root->log_transid;
        BTRFS_I(inode)->last_log_commit = BTRFS_I(inode)->root->last_log_commit;
 
@@ -9067,13 +9100,14 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 
 static int btrfs_truncate(struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_block_rsv *rsv;
        int ret = 0;
        int err = 0;
        struct btrfs_trans_handle *trans;
-       u64 mask = root->fs_info->sectorsize - 1;
-       u64 min_size = btrfs_calc_trunc_metadata_size(root->fs_info, 1);
+       u64 mask = fs_info->sectorsize - 1;
+       u64 min_size = btrfs_calc_trunc_metadata_size(fs_info, 1);
 
        ret = btrfs_wait_ordered_range(inode, inode->i_size & (~mask),
                                       (u64)-1);
@@ -9133,7 +9167,7 @@ static int btrfs_truncate(struct inode *inode)
        }
 
        /* Migrate the slack space for the truncate to our reserve */
-       ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, rsv,
+       ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,
                                      min_size, 0);
        BUG_ON(ret);
 
@@ -9156,7 +9190,7 @@ static int btrfs_truncate(struct inode *inode)
                        break;
                }
 
-               trans->block_rsv = &root->fs_info->trans_block_rsv;
+               trans->block_rsv = &fs_info->trans_block_rsv;
                ret = btrfs_update_inode(trans, root, inode);
                if (ret) {
                        err = ret;
@@ -9173,7 +9207,7 @@ static int btrfs_truncate(struct inode *inode)
                        break;
                }
 
-               ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv,
+               ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,
                                              rsv, min_size, 0);
                BUG_ON(ret);    /* shouldn't happen */
                trans->block_rsv = rsv;
@@ -9187,7 +9221,7 @@ static int btrfs_truncate(struct inode *inode)
        }
 
        if (trans) {
-               trans->block_rsv = &root->fs_info->trans_block_rsv;
+               trans->block_rsv = &fs_info->trans_block_rsv;
                ret = btrfs_update_inode(trans, root, inode);
                if (ret && !err)
                        err = ret;
@@ -9312,6 +9346,7 @@ static void btrfs_i_callback(struct rcu_head *head)
 
 void btrfs_destroy_inode(struct inode *inode)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ordered_extent *ordered;
        struct btrfs_root *root = BTRFS_I(inode)->root;
 
@@ -9333,8 +9368,8 @@ void btrfs_destroy_inode(struct inode *inode)
 
        if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
                     &BTRFS_I(inode)->runtime_flags)) {
-               btrfs_info(root->fs_info, "inode %llu still on the orphan list",
-                       btrfs_ino(inode));
+               btrfs_info(fs_info, "inode %llu still on the orphan list",
+                          btrfs_ino(inode));
                atomic_dec(&root->orphan_inodes);
        }
 
@@ -9343,7 +9378,7 @@ void btrfs_destroy_inode(struct inode *inode)
                if (!ordered)
                        break;
                else {
-                       btrfs_err(root->fs_info,
+                       btrfs_err(fs_info,
                                  "found ordered extent %llu %llu on inode cleanup",
                                  ordered->file_offset, ordered->len);
                        btrfs_remove_ordered_extent(inode, ordered);
@@ -9455,6 +9490,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,
                              struct inode *new_dir,
                              struct dentry *new_dentry)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(old_dir->i_sb);
        struct btrfs_trans_handle *trans;
        struct btrfs_root *root = BTRFS_I(old_dir)->root;
        struct btrfs_root *dest = BTRFS_I(new_dir)->root;
@@ -9477,9 +9513,9 @@ static int btrfs_rename_exchange(struct inode *old_dir,
 
        /* close the race window with snapshot create/destroy ioctl */
        if (old_ino == BTRFS_FIRST_FREE_OBJECTID)
-               down_read(&root->fs_info->subvol_sem);
+               down_read(&fs_info->subvol_sem);
        if (new_ino == BTRFS_FIRST_FREE_OBJECTID)
-               down_read(&dest->fs_info->subvol_sem);
+               down_read(&fs_info->subvol_sem);
 
        /*
         * We want to reserve the absolute worst case amount of items.  So if
@@ -9512,7 +9548,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,
        /* Reference for the source. */
        if (old_ino == BTRFS_FIRST_FREE_OBJECTID) {
                /* force full log commit if subvolume involved. */
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
        } else {
                btrfs_pin_log_trans(root);
                root_log_pinned = true;
@@ -9528,7 +9564,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,
        /* And now for the dest. */
        if (new_ino == BTRFS_FIRST_FREE_OBJECTID) {
                /* force full log commit if subvolume involved. */
-               btrfs_set_log_full_commit(dest->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
        } else {
                btrfs_pin_log_trans(dest);
                dest_log_pinned = true;
@@ -9642,12 +9678,12 @@ static int btrfs_rename_exchange(struct inode *old_dir,
         * allow the tasks to sync it.
         */
        if (ret && (root_log_pinned || dest_log_pinned)) {
-               if (btrfs_inode_in_log(old_dir, root->fs_info->generation) ||
-                   btrfs_inode_in_log(new_dir, root->fs_info->generation) ||
-                   btrfs_inode_in_log(old_inode, root->fs_info->generation) ||
+               if (btrfs_inode_in_log(old_dir, fs_info->generation) ||
+                   btrfs_inode_in_log(new_dir, fs_info->generation) ||
+                   btrfs_inode_in_log(old_inode, fs_info->generation) ||
                    (new_inode &&
-                    btrfs_inode_in_log(new_inode, root->fs_info->generation)))
-                   btrfs_set_log_full_commit(root->fs_info, trans);
+                    btrfs_inode_in_log(new_inode, fs_info->generation)))
+                       btrfs_set_log_full_commit(fs_info, trans);
 
                if (root_log_pinned) {
                        btrfs_end_log_trans(root);
@@ -9661,9 +9697,9 @@ static int btrfs_rename_exchange(struct inode *old_dir,
        ret = btrfs_end_transaction(trans, root);
 out_notrans:
        if (new_ino == BTRFS_FIRST_FREE_OBJECTID)
-               up_read(&dest->fs_info->subvol_sem);
+               up_read(&fs_info->subvol_sem);
        if (old_ino == BTRFS_FIRST_FREE_OBJECTID)
-               up_read(&root->fs_info->subvol_sem);
+               up_read(&fs_info->subvol_sem);
 
        return ret;
 }
@@ -9723,6 +9759,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                           struct inode *new_dir, struct dentry *new_dentry,
                           unsigned int flags)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(old_dir->i_sb);
        struct btrfs_trans_handle *trans;
        unsigned int trans_num_items;
        struct btrfs_root *root = BTRFS_I(old_dir)->root;
@@ -9779,7 +9816,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 
        /* close the racy window with snapshot create/destroy ioctl */
        if (old_ino == BTRFS_FIRST_FREE_OBJECTID)
-               down_read(&root->fs_info->subvol_sem);
+               down_read(&fs_info->subvol_sem);
        /*
         * We want to reserve the absolute worst case amount of items.  So if
         * both inodes are subvols and we need to unlink them then that would
@@ -9810,7 +9847,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        BTRFS_I(old_inode)->dir_index = 0ULL;
        if (unlikely(old_ino == BTRFS_FIRST_FREE_OBJECTID)) {
                /* force full log commit if subvolume involved. */
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
        } else {
                btrfs_pin_log_trans(root);
                log_pinned = true;
@@ -9917,12 +9954,12 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         * allow the tasks to sync it.
         */
        if (ret && log_pinned) {
-               if (btrfs_inode_in_log(old_dir, root->fs_info->generation) ||
-                   btrfs_inode_in_log(new_dir, root->fs_info->generation) ||
-                   btrfs_inode_in_log(old_inode, root->fs_info->generation) ||
+               if (btrfs_inode_in_log(old_dir, fs_info->generation) ||
+                   btrfs_inode_in_log(new_dir, fs_info->generation) ||
+                   btrfs_inode_in_log(old_inode, fs_info->generation) ||
                    (new_inode &&
-                    btrfs_inode_in_log(new_inode, root->fs_info->generation)))
-                   btrfs_set_log_full_commit(root->fs_info, trans);
+                    btrfs_inode_in_log(new_inode, fs_info->generation)))
+                       btrfs_set_log_full_commit(fs_info, trans);
 
                btrfs_end_log_trans(root);
                log_pinned = false;
@@ -9930,7 +9967,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        btrfs_end_transaction(trans, root);
 out_notrans:
        if (old_ino == BTRFS_FIRST_FREE_OBJECTID)
-               up_read(&root->fs_info->subvol_sem);
+               up_read(&fs_info->subvol_sem);
 
        return ret;
 }
@@ -10065,9 +10102,10 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput,
 
 int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
 
-       if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))
+       if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
                return -EROFS;
 
        ret = __start_delalloc_inodes(root, delay_iput, -1);
@@ -10078,14 +10116,14 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput)
         * we have to make sure the IO is actually started and that
         * ordered extents get created before we return
         */
-       atomic_inc(&root->fs_info->async_submit_draining);
-       while (atomic_read(&root->fs_info->nr_async_submits) ||
-             atomic_read(&root->fs_info->async_delalloc_pages)) {
-               wait_event(root->fs_info->async_submit_wait,
-                  (atomic_read(&root->fs_info->nr_async_submits) == 0 &&
-                   atomic_read(&root->fs_info->async_delalloc_pages) == 0));
-       }
-       atomic_dec(&root->fs_info->async_submit_draining);
+       atomic_inc(&fs_info->async_submit_draining);
+       while (atomic_read(&fs_info->nr_async_submits) ||
+              atomic_read(&fs_info->async_delalloc_pages)) {
+               wait_event(fs_info->async_submit_wait,
+                          (atomic_read(&fs_info->nr_async_submits) == 0 &&
+                           atomic_read(&fs_info->async_delalloc_pages) == 0));
+       }
+       atomic_dec(&fs_info->async_submit_draining);
        return ret;
 }
 
@@ -10148,6 +10186,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput,
 static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
                         const char *symname)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);
        struct btrfs_trans_handle *trans;
        struct btrfs_root *root = BTRFS_I(dir)->root;
        struct btrfs_path *path;
@@ -10164,7 +10203,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
        struct extent_buffer *leaf;
 
        name_len = strlen(symname);
-       if (name_len > BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info))
+       if (name_len > BTRFS_MAX_INLINE_DATA_SIZE(fs_info))
                return -ENAMETOOLONG;
 
        /*
@@ -10277,6 +10316,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
                                       loff_t actual_len, u64 *alloc_hint,
                                       struct btrfs_trans_handle *trans)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
        struct extent_map *em;
        struct btrfs_root *root = BTRFS_I(inode)->root;
@@ -10316,7 +10356,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
                                btrfs_end_transaction(trans, root);
                        break;
                }
-               btrfs_dec_block_group_reservations(root->fs_info, ins.objectid);
+               btrfs_dec_block_group_reservations(fs_info, ins.objectid);
 
                last_alloc = ins.offset;
                ret = insert_reserved_file_extent(trans, inode,
@@ -10350,7 +10390,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
                em->block_len = ins.offset;
                em->orig_block_len = ins.offset;
                em->ram_bytes = ins.offset;
-               em->bdev = root->fs_info->fs_devices->latest_bdev;
+               em->bdev = fs_info->fs_devices->latest_bdev;
                set_bit(EXTENT_FLAG_PREALLOC, &em->flags);
                em->generation = trans->transid;
 
index 062f67ac1335785149ef7b2c09c3557325a329b0..d00e4d3c1bafaf4f41e705f8af49544b5abb489e 100644 (file)
@@ -215,6 +215,7 @@ static int check_flags(unsigned int flags)
 static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
 {
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_inode *ip = BTRFS_I(inode);
        struct btrfs_root *root = ip->root;
        struct btrfs_trans_handle *trans;
@@ -324,7 +325,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
                ip->flags |= BTRFS_INODE_COMPRESS;
                ip->flags &= ~BTRFS_INODE_NOCOMPRESS;
 
-               if (root->fs_info->compress_type == BTRFS_COMPRESS_LZO)
+               if (fs_info->compress_type == BTRFS_COMPRESS_LZO)
                        comp = "lzo";
                else
                        comp = "zlib";
@@ -373,7 +374,8 @@ static int btrfs_ioctl_getversion(struct file *file, int __user *arg)
 
 static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(file_inode(file)->i_sb);
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_device *device;
        struct request_queue *q;
        struct fstrim_range range;
@@ -436,6 +438,7 @@ static noinline int create_subvol(struct inode *dir,
                                  u64 *async_transid,
                                  struct btrfs_qgroup_inherit *inherit)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);
        struct btrfs_trans_handle *trans;
        struct btrfs_key key;
        struct btrfs_root_item *root_item;
@@ -458,7 +461,7 @@ static noinline int create_subvol(struct inode *dir,
        if (!root_item)
                return -ENOMEM;
 
-       ret = btrfs_find_free_objectid(root->fs_info->tree_root, &objectid);
+       ret = btrfs_find_free_objectid(fs_info->tree_root, &objectid);
        if (ret)
                goto fail_free;
 
@@ -491,7 +494,7 @@ static noinline int create_subvol(struct inode *dir,
        trans->block_rsv = &block_rsv;
        trans->bytes_reserved = block_rsv.size;
 
-       ret = btrfs_qgroup_inherit(trans, root->fs_info, 0, objectid, inherit);
+       ret = btrfs_qgroup_inherit(trans, fs_info, 0, objectid, inherit);
        if (ret)
                goto fail;
 
@@ -507,9 +510,8 @@ static noinline int create_subvol(struct inode *dir,
        btrfs_set_header_backref_rev(leaf, BTRFS_MIXED_BACKREF_REV);
        btrfs_set_header_owner(leaf, objectid);
 
-       write_extent_buffer_fsid(leaf, root->fs_info->fsid);
-       write_extent_buffer_chunk_tree_uuid(leaf,
-                       root->fs_info->chunk_tree_uuid);
+       write_extent_buffer_fsid(leaf, fs_info->fsid);
+       write_extent_buffer_chunk_tree_uuid(leaf, fs_info->chunk_tree_uuid);
        btrfs_mark_buffer_dirty(leaf);
 
        inode_item = &root_item->inode;
@@ -517,7 +519,7 @@ static noinline int create_subvol(struct inode *dir,
        btrfs_set_stack_inode_size(inode_item, 3);
        btrfs_set_stack_inode_nlink(inode_item, 1);
        btrfs_set_stack_inode_nbytes(inode_item,
-                                    root->fs_info->nodesize);
+                                    fs_info->nodesize);
        btrfs_set_stack_inode_mode(inode_item, S_IFDIR | 0755);
 
        btrfs_set_root_flags(root_item, 0);
@@ -550,13 +552,13 @@ static noinline int create_subvol(struct inode *dir,
        key.objectid = objectid;
        key.offset = 0;
        key.type = BTRFS_ROOT_ITEM_KEY;
-       ret = btrfs_insert_root(trans, root->fs_info->tree_root, &key,
+       ret = btrfs_insert_root(trans, fs_info->tree_root, &key,
                                root_item);
        if (ret)
                goto fail;
 
        key.offset = (u64)-1;
-       new_root = btrfs_read_fs_root_no_name(root->fs_info, &key);
+       new_root = btrfs_read_fs_root_no_name(fs_info, &key);
        if (IS_ERR(new_root)) {
                ret = PTR_ERR(new_root);
                btrfs_abort_transaction(trans, ret);
@@ -597,12 +599,12 @@ static noinline int create_subvol(struct inode *dir,
        ret = btrfs_update_inode(trans, root, dir);
        BUG_ON(ret);
 
-       ret = btrfs_add_root_ref(trans, root->fs_info,
+       ret = btrfs_add_root_ref(trans, fs_info,
                                 objectid, root->root_key.objectid,
                                 btrfs_ino(dir), index, name, namelen);
        BUG_ON(ret);
 
-       ret = btrfs_uuid_tree_add(trans, root->fs_info, root_item->uuid,
+       ret = btrfs_uuid_tree_add(trans, fs_info, root_item->uuid,
                                  BTRFS_UUID_KEY_SUBVOL, objectid);
        if (ret)
                btrfs_abort_transaction(trans, ret);
@@ -659,6 +661,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
                           u64 *async_transid, bool readonly,
                           struct btrfs_qgroup_inherit *inherit)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);
        struct inode *inode;
        struct btrfs_pending_snapshot *pending_snapshot;
        struct btrfs_trans_handle *trans;
@@ -718,19 +721,19 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
                goto fail;
        }
 
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
        list_add(&pending_snapshot->list,
                 &trans->transaction->pending_snapshots);
-       spin_unlock(&root->fs_info->trans_lock);
+       spin_unlock(&fs_info->trans_lock);
        if (async_transid) {
                *async_transid = trans->transid;
                ret = btrfs_commit_transaction_async(trans,
-                                    root->fs_info->extent_root, 1);
+                                    fs_info->extent_root, 1);
                if (ret)
                        ret = btrfs_commit_transaction(trans, root);
        } else {
                ret = btrfs_commit_transaction(trans,
-                                              root->fs_info->extent_root);
+                                              fs_info->extent_root);
        }
        if (ret)
                goto fail;
@@ -839,7 +842,8 @@ static noinline int btrfs_mksubvol(struct path *parent,
                                   u64 *async_transid, bool readonly,
                                   struct btrfs_qgroup_inherit *inherit)
 {
-       struct inode *dir  = d_inode(parent->dentry);
+       struct inode *dir = d_inode(parent->dentry);
+       struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);
        struct dentry *dentry;
        int error;
 
@@ -866,7 +870,7 @@ static noinline int btrfs_mksubvol(struct path *parent,
        if (error)
                goto out_dput;
 
-       down_read(&BTRFS_I(dir)->root->fs_info->subvol_sem);
+       down_read(&fs_info->subvol_sem);
 
        if (btrfs_root_refs(&BTRFS_I(dir)->root->root_item) == 0)
                goto out_up_read;
@@ -881,7 +885,7 @@ static noinline int btrfs_mksubvol(struct path *parent,
        if (!error)
                fsnotify_mkdir(dir, dentry);
 out_up_read:
-       up_read(&BTRFS_I(dir)->root->fs_info->subvol_sem);
+       up_read(&fs_info->subvol_sem);
 out_dput:
        dput(dentry);
 out_unlock:
@@ -1265,6 +1269,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
                      struct btrfs_ioctl_defrag_range_args *range,
                      u64 newer_than, unsigned long max_to_defrag)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct file_ra_state *ra = NULL;
        unsigned long last_index;
@@ -1362,8 +1367,8 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
                if (!(inode->i_sb->s_flags & MS_ACTIVE))
                        break;
 
-               if (btrfs_defrag_cancelled(root->fs_info)) {
-                       btrfs_debug(root->fs_info, "defrag_file cancelled");
+               if (btrfs_defrag_cancelled(fs_info)) {
+                       btrfs_debug(fs_info, "defrag_file cancelled");
                        ret = -EAGAIN;
                        break;
                }
@@ -1451,18 +1456,18 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
                 * we have to make sure the IO is actually started and that
                 * ordered extents get created before we return
                 */
-               atomic_inc(&root->fs_info->async_submit_draining);
-               while (atomic_read(&root->fs_info->nr_async_submits) ||
-                     atomic_read(&root->fs_info->async_delalloc_pages)) {
-                       wait_event(root->fs_info->async_submit_wait,
-                          (atomic_read(&root->fs_info->nr_async_submits) == 0 &&
-                           atomic_read(&root->fs_info->async_delalloc_pages) == 0));
+               atomic_inc(&fs_info->async_submit_draining);
+               while (atomic_read(&fs_info->nr_async_submits) ||
+                      atomic_read(&fs_info->async_delalloc_pages)) {
+                       wait_event(fs_info->async_submit_wait,
+                                  (atomic_read(&fs_info->nr_async_submits) == 0 &&
+                                   atomic_read(&fs_info->async_delalloc_pages) == 0));
                }
-               atomic_dec(&root->fs_info->async_submit_draining);
+               atomic_dec(&fs_info->async_submit_draining);
        }
 
        if (range->compress_type == BTRFS_COMPRESS_LZO) {
-               btrfs_set_fs_incompat(root->fs_info, COMPRESS_LZO);
+               btrfs_set_fs_incompat(fs_info, COMPRESS_LZO);
        }
 
        ret = defrag_count;
@@ -1482,10 +1487,12 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
 static noinline int btrfs_ioctl_resize(struct file *file,
                                        void __user *arg)
 {
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        u64 new_size;
        u64 old_size;
        u64 devid = 1;
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ioctl_vol_args *vol_args;
        struct btrfs_trans_handle *trans;
        struct btrfs_device *device = NULL;
@@ -1502,13 +1509,12 @@ static noinline int btrfs_ioctl_resize(struct file *file,
        if (ret)
                return ret;
 
-       if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running,
-                       1)) {
+       if (atomic_xchg(&fs_info->mutually_exclusive_operation_running, 1)) {
                mnt_drop_write_file(file);
                return BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS;
        }
 
-       mutex_lock(&root->fs_info->volume_mutex);
+       mutex_lock(&fs_info->volume_mutex);
        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args)) {
                ret = PTR_ERR(vol_args);
@@ -1530,19 +1536,19 @@ static noinline int btrfs_ioctl_resize(struct file *file,
                        ret = -EINVAL;
                        goto out_free;
                }
-               btrfs_info(root->fs_info, "resizing devid %llu", devid);
+               btrfs_info(fs_info, "resizing devid %llu", devid);
        }
 
-       device = btrfs_find_device(root->fs_info, devid, NULL, NULL);
+       device = btrfs_find_device(fs_info, devid, NULL, NULL);
        if (!device) {
-               btrfs_info(root->fs_info, "resizer unable to find device %llu",
-                      devid);
+               btrfs_info(fs_info, "resizer unable to find device %llu",
+                          devid);
                ret = -ENODEV;
                goto out_free;
        }
 
        if (!device->writeable) {
-               btrfs_info(root->fs_info,
+               btrfs_info(fs_info,
                           "resizer unable to apply on readonly device %llu",
                       devid);
                ret = -EPERM;
@@ -1596,11 +1602,11 @@ static noinline int btrfs_ioctl_resize(struct file *file,
                goto out_free;
        }
 
-       new_size = div_u64(new_size, root->fs_info->sectorsize);
-       new_size *= root->fs_info->sectorsize;
+       new_size = div_u64(new_size, fs_info->sectorsize);
+       new_size *= fs_info->sectorsize;
 
-       btrfs_info_in_rcu(root->fs_info, "new size for %s is %llu",
-                     rcu_str_deref(device->name), new_size);
+       btrfs_info_in_rcu(fs_info, "new size for %s is %llu",
+                         rcu_str_deref(device->name), new_size);
 
        if (new_size > old_size) {
                trans = btrfs_start_transaction(root, 0);
@@ -1617,8 +1623,8 @@ static noinline int btrfs_ioctl_resize(struct file *file,
 out_free:
        kfree(vol_args);
 out:
-       mutex_unlock(&root->fs_info->volume_mutex);
-       atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
+       mutex_unlock(&fs_info->volume_mutex);
+       atomic_set(&fs_info->mutually_exclusive_operation_running, 0);
        mnt_drop_write_file(file);
        return ret;
 }
@@ -1771,6 +1777,7 @@ static noinline int btrfs_ioctl_subvol_getflags(struct file *file,
                                                void __user *arg)
 {
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        int ret = 0;
        u64 flags = 0;
@@ -1778,10 +1785,10 @@ static noinline int btrfs_ioctl_subvol_getflags(struct file *file,
        if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID)
                return -EINVAL;
 
-       down_read(&root->fs_info->subvol_sem);
+       down_read(&fs_info->subvol_sem);
        if (btrfs_root_readonly(root))
                flags |= BTRFS_SUBVOL_RDONLY;
-       up_read(&root->fs_info->subvol_sem);
+       up_read(&fs_info->subvol_sem);
 
        if (copy_to_user(arg, &flags, sizeof(flags)))
                ret = -EFAULT;
@@ -1793,6 +1800,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
                                              void __user *arg)
 {
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans;
        u64 root_flags;
@@ -1826,7 +1834,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
                goto out_drop_write;
        }
 
-       down_write(&root->fs_info->subvol_sem);
+       down_write(&fs_info->subvol_sem);
 
        /* nothing to do */
        if (!!(flags & BTRFS_SUBVOL_RDONLY) == btrfs_root_readonly(root))
@@ -1848,9 +1856,9 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
                        spin_unlock(&root->root_item_lock);
                } else {
                        spin_unlock(&root->root_item_lock);
-                       btrfs_warn(root->fs_info,
-                       "Attempt to set subvolume %llu read-write during send",
-                                       root->root_key.objectid);
+                       btrfs_warn(fs_info,
+                                  "Attempt to set subvolume %llu read-write during send",
+                                  root->root_key.objectid);
                        ret = -EPERM;
                        goto out_drop_sem;
                }
@@ -1862,7 +1870,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
                goto out_reset;
        }
 
-       ret = btrfs_update_root(trans, root->fs_info->tree_root,
+       ret = btrfs_update_root(trans, fs_info->tree_root,
                                &root->root_key, &root->root_item);
 
        btrfs_commit_transaction(trans, root);
@@ -1870,7 +1878,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
        if (ret)
                btrfs_set_root_flags(&root->root_item, root_flags);
 out_drop_sem:
-       up_write(&root->fs_info->subvol_sem);
+       up_write(&fs_info->subvol_sem);
 out_drop_write:
        mnt_drop_write_file(file);
 out:
@@ -1882,6 +1890,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
  */
 static noinline int may_destroy_subvol(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct btrfs_dir_item *di;
        struct btrfs_key key;
@@ -1893,14 +1902,14 @@ static noinline int may_destroy_subvol(struct btrfs_root *root)
                return -ENOMEM;
 
        /* Make sure this root isn't set as the default subvol */
-       dir_id = btrfs_super_root_dir(root->fs_info->super_copy);
-       di = btrfs_lookup_dir_item(NULL, root->fs_info->tree_root, path,
+       dir_id = btrfs_super_root_dir(fs_info->super_copy);
+       di = btrfs_lookup_dir_item(NULL, fs_info->tree_root, path,
                                   dir_id, "default", 7, 0);
        if (di && !IS_ERR(di)) {
                btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);
                if (key.objectid == root->root_key.objectid) {
                        ret = -EPERM;
-                       btrfs_err(root->fs_info,
+                       btrfs_err(fs_info,
                                  "deleting default subvolume %llu is not allowed",
                                  key.objectid);
                        goto out;
@@ -1912,8 +1921,7 @@ static noinline int may_destroy_subvol(struct btrfs_root *root)
        key.type = BTRFS_ROOT_REF_KEY;
        key.offset = (u64)-1;
 
-       ret = btrfs_search_slot(NULL, root->fs_info->tree_root,
-                               &key, path, 0, 0);
+       ret = btrfs_search_slot(NULL, fs_info->tree_root, &key, path, 0, 0);
        if (ret < 0)
                goto out;
        BUG_ON(ret == 0);
@@ -2084,10 +2092,10 @@ static noinline int search_ioctl(struct inode *inode,
                                 size_t *buf_size,
                                 char __user *ubuf)
 {
+       struct btrfs_fs_info *info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root;
        struct btrfs_key key;
        struct btrfs_path *path;
-       struct btrfs_fs_info *info = BTRFS_I(inode)->root->fs_info;
        int ret;
        int num_found = 0;
        unsigned long sk_offset = 0;
@@ -2350,6 +2358,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
                                             void __user *arg)
 {
        struct dentry *parent = file->f_path.dentry;
+       struct btrfs_fs_info *fs_info = btrfs_sb(parent->d_sb);
        struct dentry *dentry;
        struct inode *dir = d_inode(parent);
        struct inode *inode;
@@ -2415,7 +2424,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
                 * rmdir(2).
                 */
                err = -EPERM;
-               if (!btrfs_test_opt(root->fs_info, USER_SUBVOL_RM_ALLOWED))
+               if (!btrfs_test_opt(fs_info, USER_SUBVOL_RM_ALLOWED))
                        goto out_dput;
 
                /*
@@ -2459,14 +2468,14 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
                spin_unlock(&dest->root_item_lock);
        } else {
                spin_unlock(&dest->root_item_lock);
-               btrfs_warn(root->fs_info,
-                       "Attempt to delete subvolume %llu during send",
-                       dest->root_key.objectid);
+               btrfs_warn(fs_info,
+                          "Attempt to delete subvolume %llu during send",
+                          dest->root_key.objectid);
                err = -EPERM;
                goto out_unlock_inode;
        }
 
-       down_write(&root->fs_info->subvol_sem);
+       down_write(&fs_info->subvol_sem);
 
        err = may_destroy_subvol(dest);
        if (err)
@@ -2511,7 +2520,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
 
        if (!test_and_set_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED, &dest->state)) {
                ret = btrfs_insert_orphan_item(trans,
-                                       root->fs_info->tree_root,
+                                       fs_info->tree_root,
                                        dest->root_key.objectid);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
@@ -2520,7 +2529,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
                }
        }
 
-       ret = btrfs_uuid_tree_rem(trans, root->fs_info, dest->root_item.uuid,
+       ret = btrfs_uuid_tree_rem(trans, fs_info, dest->root_item.uuid,
                                  BTRFS_UUID_KEY_SUBVOL,
                                  dest->root_key.objectid);
        if (ret && ret != -ENOENT) {
@@ -2529,7 +2538,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
                goto out_end_trans;
        }
        if (!btrfs_is_empty_uuid(dest->root_item.received_uuid)) {
-               ret = btrfs_uuid_tree_rem(trans, root->fs_info,
+               ret = btrfs_uuid_tree_rem(trans, fs_info,
                                          dest->root_item.received_uuid,
                                          BTRFS_UUID_KEY_RECEIVED_SUBVOL,
                                          dest->root_key.objectid);
@@ -2550,7 +2559,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
 out_release:
        btrfs_subvolume_release_metadata(root, &block_rsv, qgroup_reserved);
 out_up_write:
-       up_write(&root->fs_info->subvol_sem);
+       up_write(&fs_info->subvol_sem);
        if (err) {
                spin_lock(&dest->root_item_lock);
                root_flags = btrfs_root_flags(&dest->root_item);
@@ -2654,18 +2663,17 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 
 static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_ioctl_vol_args *vol_args;
        int ret;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running,
-                       1)) {
+       if (atomic_xchg(&fs_info->mutually_exclusive_operation_running, 1))
                return BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS;
-       }
 
-       mutex_lock(&root->fs_info->volume_mutex);
+       mutex_lock(&fs_info->volume_mutex);
        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args)) {
                ret = PTR_ERR(vol_args);
@@ -2676,18 +2684,20 @@ static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg)
        ret = btrfs_init_new_device(root->fs_info, vol_args->name);
 
        if (!ret)
-               btrfs_info(root->fs_info, "disk added %s",vol_args->name);
+               btrfs_info(fs_info, "disk added %s", vol_args->name);
 
        kfree(vol_args);
 out:
-       mutex_unlock(&root->fs_info->volume_mutex);
-       atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
+       mutex_unlock(&fs_info->volume_mutex);
+       atomic_set(&fs_info->mutually_exclusive_operation_running, 0);
        return ret;
 }
 
 static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ioctl_vol_args_v2 *vol_args;
        int ret;
 
@@ -2708,28 +2718,27 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)
        if (vol_args->flags & ~BTRFS_VOL_ARG_V2_FLAGS_SUPPORTED)
                return -EOPNOTSUPP;
 
-       if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running,
-                       1)) {
+       if (atomic_xchg(&fs_info->mutually_exclusive_operation_running, 1)) {
                ret = BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS;
                goto out;
        }
 
-       mutex_lock(&root->fs_info->volume_mutex);
+       mutex_lock(&fs_info->volume_mutex);
        if (vol_args->flags & BTRFS_DEVICE_SPEC_BY_ID) {
                ret = btrfs_rm_device(root, NULL, vol_args->devid);
        } else {
                vol_args->name[BTRFS_SUBVOL_NAME_MAX] = '\0';
                ret = btrfs_rm_device(root, vol_args->name, 0);
        }
-       mutex_unlock(&root->fs_info->volume_mutex);
-       atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
+       mutex_unlock(&fs_info->volume_mutex);
+       atomic_set(&fs_info->mutually_exclusive_operation_running, 0);
 
        if (!ret) {
                if (vol_args->flags & BTRFS_DEVICE_SPEC_BY_ID)
-                       btrfs_info(root->fs_info, "device deleted: id %llu",
+                       btrfs_info(fs_info, "device deleted: id %llu",
                                        vol_args->devid);
                else
-                       btrfs_info(root->fs_info, "device deleted: %s",
+                       btrfs_info(fs_info, "device deleted: %s",
                                        vol_args->name);
        }
 out:
@@ -2741,7 +2750,9 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ioctl_vol_args *vol_args;
        int ret;
 
@@ -2752,8 +2763,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)
        if (ret)
                return ret;
 
-       if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running,
-                       1)) {
+       if (atomic_xchg(&fs_info->mutually_exclusive_operation_running, 1)) {
                ret = BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS;
                goto out_drop_write;
        }
@@ -2765,15 +2775,15 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)
        }
 
        vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
-       mutex_lock(&root->fs_info->volume_mutex);
+       mutex_lock(&fs_info->volume_mutex);
        ret = btrfs_rm_device(root, vol_args->name, 0);
-       mutex_unlock(&root->fs_info->volume_mutex);
+       mutex_unlock(&fs_info->volume_mutex);
 
        if (!ret)
-               btrfs_info(root->fs_info, "disk deleted %s",vol_args->name);
+               btrfs_info(fs_info, "disk deleted %s", vol_args->name);
        kfree(vol_args);
 out:
-       atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
+       atomic_set(&fs_info->mutually_exclusive_operation_running, 0);
 out_drop_write:
        mnt_drop_write_file(file);
 
@@ -2782,9 +2792,10 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_ioctl_fs_info_args *fi_args;
        struct btrfs_device *device;
-       struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        int ret = 0;
 
        fi_args = kzalloc(sizeof(*fi_args), GFP_KERNEL);
@@ -2793,7 +2804,7 @@ static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg)
 
        mutex_lock(&fs_devices->device_list_mutex);
        fi_args->num_devices = fs_devices->num_devices;
-       memcpy(&fi_args->fsid, root->fs_info->fsid, sizeof(fi_args->fsid));
+       memcpy(&fi_args->fsid, fs_info->fsid, sizeof(fi_args->fsid));
 
        list_for_each_entry(device, &fs_devices->devices, dev_list) {
                if (device->devid > fi_args->max_id)
@@ -2801,9 +2812,9 @@ static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg)
        }
        mutex_unlock(&fs_devices->device_list_mutex);
 
-       fi_args->nodesize = root->fs_info->super_copy->nodesize;
-       fi_args->sectorsize = root->fs_info->super_copy->sectorsize;
-       fi_args->clone_alignment = root->fs_info->super_copy->sectorsize;
+       fi_args->nodesize = fs_info->super_copy->nodesize;
+       fi_args->sectorsize = fs_info->super_copy->sectorsize;
+       fi_args->clone_alignment = fs_info->super_copy->sectorsize;
 
        if (copy_to_user(arg, fi_args, sizeof(*fi_args)))
                ret = -EFAULT;
@@ -2814,9 +2825,10 @@ static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg)
 
 static long btrfs_ioctl_dev_info(struct btrfs_root *root, void __user *arg)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_ioctl_dev_info_args *di_args;
        struct btrfs_device *dev;
-       struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        int ret = 0;
        char *s_uuid = NULL;
 
@@ -2828,7 +2840,7 @@ static long btrfs_ioctl_dev_info(struct btrfs_root *root, void __user *arg)
                s_uuid = di_args->uuid;
 
        mutex_lock(&fs_devices->device_list_mutex);
-       dev = btrfs_find_device(root->fs_info, di_args->devid, s_uuid, NULL);
+       dev = btrfs_find_device(fs_info, di_args->devid, s_uuid, NULL);
 
        if (!dev) {
                ret = -ENODEV;
@@ -3403,9 +3415,10 @@ static int clone_copy_inline_extent(struct inode *src,
                                    const u64 size,
                                    char *inline_data)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(dst->i_sb);
        struct btrfs_root *root = BTRFS_I(dst)->root;
        const u64 aligned_end = ALIGN(new_key->offset + datal,
-                                     root->fs_info->sectorsize);
+                                     fs_info->sectorsize);
        int ret;
        struct btrfs_key key;
 
@@ -3526,6 +3539,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
                       const u64 off, const u64 olen, const u64 olen_aligned,
                       const u64 destoff, int no_time_update)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_path *path = NULL;
        struct extent_buffer *leaf;
@@ -3539,10 +3553,9 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
        u64 last_dest_end = destoff;
 
        ret = -ENOMEM;
-       buf = kmalloc(root->fs_info->nodesize,
-                     GFP_KERNEL | __GFP_NOWARN);
+       buf = kmalloc(fs_info->nodesize, GFP_KERNEL | __GFP_NOWARN);
        if (!buf) {
-               buf = vmalloc(root->fs_info->nodesize);
+               buf = vmalloc(fs_info->nodesize);
                if (!buf)
                        return ret;
        }
@@ -3800,7 +3813,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
                        btrfs_release_path(path);
 
                        last_dest_end = ALIGN(new_key.offset + datal,
-                                             root->fs_info->sectorsize);
+                                             fs_info->sectorsize);
                        ret = clone_finish_inode_update(trans, inode,
                                                        last_dest_end,
                                                        destoff, olen,
@@ -3861,10 +3874,11 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src,
 {
        struct inode *inode = file_inode(file);
        struct inode *src = file_inode(file_src);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        int ret;
        u64 len = olen;
-       u64 bs = root->fs_info->sb->s_blocksize;
+       u64 bs = fs_info->sb->s_blocksize;
        int same_inode = src == inode;
 
        /*
@@ -4005,6 +4019,7 @@ int btrfs_clone_file_range(struct file *src_file, loff_t off,
 static long btrfs_ioctl_trans_start(struct file *file)
 {
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans;
        int ret;
@@ -4025,7 +4040,7 @@ static long btrfs_ioctl_trans_start(struct file *file)
        if (ret)
                goto out;
 
-       atomic_inc(&root->fs_info->open_ioctl_trans);
+       atomic_inc(&fs_info->open_ioctl_trans);
 
        ret = -ENOMEM;
        trans = btrfs_start_ioctl_transaction(root);
@@ -4036,7 +4051,7 @@ static long btrfs_ioctl_trans_start(struct file *file)
        return 0;
 
 out_drop:
-       atomic_dec(&root->fs_info->open_ioctl_trans);
+       atomic_dec(&fs_info->open_ioctl_trans);
        mnt_drop_write_file(file);
 out:
        return ret;
@@ -4045,6 +4060,7 @@ static long btrfs_ioctl_trans_start(struct file *file)
 static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
 {
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_root *new_root;
        struct btrfs_dir_item *di;
@@ -4075,7 +4091,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
        location.type = BTRFS_ROOT_ITEM_KEY;
        location.offset = (u64)-1;
 
-       new_root = btrfs_read_fs_root_no_name(root->fs_info, &location);
+       new_root = btrfs_read_fs_root_no_name(fs_info, &location);
        if (IS_ERR(new_root)) {
                ret = PTR_ERR(new_root);
                goto out;
@@ -4095,13 +4111,13 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
                goto out;
        }
 
-       dir_id = btrfs_super_root_dir(root->fs_info->super_copy);
-       di = btrfs_lookup_dir_item(trans, root->fs_info->tree_root, path,
+       dir_id = btrfs_super_root_dir(fs_info->super_copy);
+       di = btrfs_lookup_dir_item(trans, fs_info->tree_root, path,
                                   dir_id, "default", 7, 1);
        if (IS_ERR_OR_NULL(di)) {
                btrfs_free_path(path);
                btrfs_end_transaction(trans, root);
-               btrfs_err(new_root->fs_info,
+               btrfs_err(fs_info,
                          "Umm, you don't have the default diritem, this isn't going to work");
                ret = -ENOENT;
                goto out;
@@ -4112,7 +4128,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
        btrfs_mark_buffer_dirty(path->nodes[0]);
        btrfs_free_path(path);
 
-       btrfs_set_fs_incompat(root->fs_info, DEFAULT_SUBVOL);
+       btrfs_set_fs_incompat(fs_info, DEFAULT_SUBVOL);
        btrfs_end_transaction(trans, root);
 out:
        mnt_drop_write_file(file);
@@ -4137,6 +4153,7 @@ void btrfs_get_block_group_info(struct list_head *groups_list,
 
 static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_ioctl_space_args space_args;
        struct btrfs_ioctl_space_info space;
        struct btrfs_ioctl_space_info *dest;
@@ -4163,7 +4180,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
 
                info = NULL;
                rcu_read_lock();
-               list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
+               list_for_each_entry_rcu(tmp, &fs_info->space_info,
                                        list) {
                        if (tmp->flags == types[i]) {
                                info = tmp;
@@ -4219,7 +4236,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
 
                info = NULL;
                rcu_read_lock();
-               list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
+               list_for_each_entry_rcu(tmp, &fs_info->space_info,
                                        list) {
                        if (tmp->flags == types[i]) {
                                info = tmp;
@@ -4250,7 +4267,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
         * Add global block reserve
         */
        if (slot_count) {
-               struct btrfs_block_rsv *block_rsv = &root->fs_info->global_block_rsv;
+               struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv;
 
                spin_lock(&block_rsv->lock);
                space.total_bytes = block_rsv->size;
@@ -4345,7 +4362,7 @@ static noinline long btrfs_ioctl_wait_sync(struct btrfs_root *root,
 
 static long btrfs_ioctl_scrub(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(file_inode(file)->i_sb);
        struct btrfs_ioctl_scrub_args *sa;
        int ret;
 
@@ -4362,7 +4379,7 @@ static long btrfs_ioctl_scrub(struct file *file, void __user *arg)
                        goto out;
        }
 
-       ret = btrfs_scrub_dev(root->fs_info, sa->devid, sa->start, sa->end,
+       ret = btrfs_scrub_dev(fs_info, sa->devid, sa->start, sa->end,
                              &sa->progress, sa->flags & BTRFS_SCRUB_READONLY,
                              0);
 
@@ -4432,6 +4449,7 @@ static long btrfs_ioctl_get_dev_stats(struct btrfs_root *root,
 
 static long btrfs_ioctl_dev_replace(struct btrfs_root *root, void __user *arg)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_ioctl_dev_replace_args *p;
        int ret;
 
@@ -4444,27 +4462,25 @@ static long btrfs_ioctl_dev_replace(struct btrfs_root *root, void __user *arg)
 
        switch (p->cmd) {
        case BTRFS_IOCTL_DEV_REPLACE_CMD_START:
-               if (root->fs_info->sb->s_flags & MS_RDONLY) {
+               if (fs_info->sb->s_flags & MS_RDONLY) {
                        ret = -EROFS;
                        goto out;
                }
                if (atomic_xchg(
-                       &root->fs_info->mutually_exclusive_operation_running,
-                       1)) {
+                       &fs_info->mutually_exclusive_operation_running, 1)) {
                        ret = BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS;
                } else {
                        ret = btrfs_dev_replace_by_ioctl(root, p);
                        atomic_set(
-                        &root->fs_info->mutually_exclusive_operation_running,
-                        0);
+                        &fs_info->mutually_exclusive_operation_running, 0);
                }
                break;
        case BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS:
-               btrfs_dev_replace_status(root->fs_info, p);
+               btrfs_dev_replace_status(fs_info, p);
                ret = 0;
                break;
        case BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL:
-               ret = btrfs_dev_replace_cancel(root->fs_info, p);
+               ret = btrfs_dev_replace_cancel(fs_info, p);
                break;
        default:
                ret = -EINVAL;
@@ -4785,14 +4801,16 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_balance_ctl(struct btrfs_root *root, int cmd)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
        switch (cmd) {
        case BTRFS_BALANCE_CTL_PAUSE:
-               return btrfs_pause_balance(root->fs_info);
+               return btrfs_pause_balance(fs_info);
        case BTRFS_BALANCE_CTL_CANCEL:
-               return btrfs_cancel_balance(root->fs_info);
+               return btrfs_cancel_balance(fs_info);
        }
 
        return -EINVAL;
@@ -4833,7 +4851,8 @@ static long btrfs_ioctl_balance_progress(struct btrfs_root *root,
 
 static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ioctl_quota_ctl_args *sa;
        struct btrfs_trans_handle *trans = NULL;
        int ret;
@@ -4852,8 +4871,8 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)
                goto drop_write;
        }
 
-       down_write(&root->fs_info->subvol_sem);
-       trans = btrfs_start_transaction(root->fs_info->tree_root, 2);
+       down_write(&fs_info->subvol_sem);
+       trans = btrfs_start_transaction(fs_info->tree_root, 2);
        if (IS_ERR(trans)) {
                ret = PTR_ERR(trans);
                goto out;
@@ -4861,22 +4880,22 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)
 
        switch (sa->cmd) {
        case BTRFS_QUOTA_CTL_ENABLE:
-               ret = btrfs_quota_enable(trans, root->fs_info);
+               ret = btrfs_quota_enable(trans, fs_info);
                break;
        case BTRFS_QUOTA_CTL_DISABLE:
-               ret = btrfs_quota_disable(trans, root->fs_info);
+               ret = btrfs_quota_disable(trans, fs_info);
                break;
        default:
                ret = -EINVAL;
                break;
        }
 
-       err = btrfs_commit_transaction(trans, root->fs_info->tree_root);
+       err = btrfs_commit_transaction(trans, fs_info->tree_root);
        if (err && !ret)
                ret = err;
 out:
        kfree(sa);
-       up_write(&root->fs_info->subvol_sem);
+       up_write(&fs_info->subvol_sem);
 drop_write:
        mnt_drop_write_file(file);
        return ret;
@@ -4884,7 +4903,9 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ioctl_qgroup_assign_args *sa;
        struct btrfs_trans_handle *trans;
        int ret;
@@ -4911,18 +4932,18 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
 
        /* FIXME: check if the IDs really exist */
        if (sa->assign) {
-               ret = btrfs_add_qgroup_relation(trans, root->fs_info,
+               ret = btrfs_add_qgroup_relation(trans, fs_info,
                                                sa->src, sa->dst);
        } else {
-               ret = btrfs_del_qgroup_relation(trans, root->fs_info,
+               ret = btrfs_del_qgroup_relation(trans, fs_info,
                                                sa->src, sa->dst);
        }
 
        /* update qgroup status and info */
-       err = btrfs_run_qgroups(trans, root->fs_info);
+       err = btrfs_run_qgroups(trans, fs_info);
        if (err < 0)
-               btrfs_handle_fs_error(root->fs_info, err,
-                           "failed to update qgroup status and info");
+               btrfs_handle_fs_error(fs_info, err,
+                                     "failed to update qgroup status and info");
        err = btrfs_end_transaction(trans, root);
        if (err && !ret)
                ret = err;
@@ -4936,7 +4957,9 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ioctl_qgroup_create_args *sa;
        struct btrfs_trans_handle *trans;
        int ret;
@@ -4968,9 +4991,9 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg)
 
        /* FIXME: check if the IDs really exist */
        if (sa->create) {
-               ret = btrfs_create_qgroup(trans, root->fs_info, sa->qgroupid);
+               ret = btrfs_create_qgroup(trans, fs_info, sa->qgroupid);
        } else {
-               ret = btrfs_remove_qgroup(trans, root->fs_info, sa->qgroupid);
+               ret = btrfs_remove_qgroup(trans, fs_info, sa->qgroupid);
        }
 
        err = btrfs_end_transaction(trans, root);
@@ -4986,7 +5009,9 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ioctl_qgroup_limit_args *sa;
        struct btrfs_trans_handle *trans;
        int ret;
@@ -5019,7 +5044,7 @@ static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg)
        }
 
        /* FIXME: check if the IDs really exist */
-       ret = btrfs_limit_qgroup(trans, root->fs_info, qgroupid, &sa->lim);
+       ret = btrfs_limit_qgroup(trans, fs_info, qgroupid, &sa->lim);
 
        err = btrfs_end_transaction(trans, root);
        if (err && !ret)
@@ -5034,7 +5059,8 @@ static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ioctl_quota_rescan_args *qsa;
        int ret;
 
@@ -5056,7 +5082,7 @@ static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg)
                goto out;
        }
 
-       ret = btrfs_qgroup_rescan(root->fs_info);
+       ret = btrfs_qgroup_rescan(fs_info);
 
 out:
        kfree(qsa);
@@ -5067,7 +5093,8 @@ static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ioctl_quota_rescan_args *qsa;
        int ret = 0;
 
@@ -5078,9 +5105,9 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)
        if (!qsa)
                return -ENOMEM;
 
-       if (root->fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) {
+       if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) {
                qsa->flags = 1;
-               qsa->progress = root->fs_info->qgroup_rescan_progress.objectid;
+               qsa->progress = fs_info->qgroup_rescan_progress.objectid;
        }
 
        if (copy_to_user(arg, qsa, sizeof(*qsa)))
@@ -5092,18 +5119,20 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)
 
 static long btrfs_ioctl_quota_rescan_wait(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       return btrfs_qgroup_wait_for_completion(root->fs_info, true);
+       return btrfs_qgroup_wait_for_completion(fs_info, true);
 }
 
 static long _btrfs_ioctl_set_received_subvol(struct file *file,
                                            struct btrfs_ioctl_received_subvol_args *sa)
 {
        struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_root_item *root_item = &root->root_item;
        struct btrfs_trans_handle *trans;
@@ -5118,7 +5147,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
        if (ret < 0)
                return ret;
 
-       down_write(&root->fs_info->subvol_sem);
+       down_write(&fs_info->subvol_sem);
 
        if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID) {
                ret = -EINVAL;
@@ -5149,8 +5178,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
                                       BTRFS_UUID_SIZE);
        if (received_uuid_changed &&
            !btrfs_is_empty_uuid(root_item->received_uuid))
-               btrfs_uuid_tree_rem(trans, root->fs_info,
-                                   root_item->received_uuid,
+               btrfs_uuid_tree_rem(trans, fs_info, root_item->received_uuid,
                                    BTRFS_UUID_KEY_RECEIVED_SUBVOL,
                                    root->root_key.objectid);
        memcpy(root_item->received_uuid, sa->uuid, BTRFS_UUID_SIZE);
@@ -5161,14 +5189,14 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
        btrfs_set_stack_timespec_sec(&root_item->rtime, sa->rtime.sec);
        btrfs_set_stack_timespec_nsec(&root_item->rtime, sa->rtime.nsec);
 
-       ret = btrfs_update_root(trans, root->fs_info->tree_root,
+       ret = btrfs_update_root(trans, fs_info->tree_root,
                                &root->root_key, &root->root_item);
        if (ret < 0) {
                btrfs_end_transaction(trans, root);
                goto out;
        }
        if (received_uuid_changed && !btrfs_is_empty_uuid(sa->uuid)) {
-               ret = btrfs_uuid_tree_add(trans, root->fs_info, sa->uuid,
+               ret = btrfs_uuid_tree_add(trans, fs_info, sa->uuid,
                                          BTRFS_UUID_KEY_RECEIVED_SUBVOL,
                                          root->root_key.objectid);
                if (ret < 0 && ret != -EEXIST) {
@@ -5183,7 +5211,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
        }
 
 out:
-       up_write(&root->fs_info->subvol_sem);
+       up_write(&fs_info->subvol_sem);
        mnt_drop_write_file(file);
        return ret;
 }
@@ -5265,20 +5293,22 @@ static long btrfs_ioctl_set_received_subvol(struct file *file,
 
 static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        size_t len;
        int ret;
        char label[BTRFS_LABEL_SIZE];
 
-       spin_lock(&root->fs_info->super_lock);
-       memcpy(label, root->fs_info->super_copy->label, BTRFS_LABEL_SIZE);
-       spin_unlock(&root->fs_info->super_lock);
+       spin_lock(&fs_info->super_lock);
+       memcpy(label, fs_info->super_copy->label, BTRFS_LABEL_SIZE);
+       spin_unlock(&fs_info->super_lock);
 
        len = strnlen(label, BTRFS_LABEL_SIZE);
 
        if (len == BTRFS_LABEL_SIZE) {
-               btrfs_warn(root->fs_info,
-                       "label is too long, return the first %zu bytes", --len);
+               btrfs_warn(fs_info,
+                          "label is too long, return the first %zu bytes",
+                          --len);
        }
 
        ret = copy_to_user(arg, label, len);
@@ -5288,8 +5318,10 @@ static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg)
 
 static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
-       struct btrfs_super_block *super_block = root->fs_info->super_copy;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_super_block *super_block = fs_info->super_copy;
        struct btrfs_trans_handle *trans;
        char label[BTRFS_LABEL_SIZE];
        int ret;
@@ -5301,7 +5333,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)
                return -EFAULT;
 
        if (strnlen(label, BTRFS_LABEL_SIZE) == BTRFS_LABEL_SIZE) {
-               btrfs_err(root->fs_info,
+               btrfs_err(fs_info,
                          "unable to set label with more than %d bytes",
                          BTRFS_LABEL_SIZE - 1);
                return -EINVAL;
@@ -5317,9 +5349,9 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)
                goto out_unlock;
        }
 
-       spin_lock(&root->fs_info->super_lock);
+       spin_lock(&fs_info->super_lock);
        strcpy(super_block->label, label);
-       spin_unlock(&root->fs_info->super_lock);
+       spin_unlock(&fs_info->super_lock);
        ret = btrfs_commit_transaction(trans, root);
 
 out_unlock:
@@ -5348,8 +5380,9 @@ int btrfs_ioctl_get_supported_features(void __user *arg)
 
 static int btrfs_ioctl_get_features(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
-       struct btrfs_super_block *super_block = root->fs_info->super_copy;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_super_block *super_block = fs_info->super_copy;
        struct btrfs_ioctl_feature_flags features;
 
        features.compat_flags = btrfs_super_compat_flags(super_block);
@@ -5367,6 +5400,7 @@ static int check_feature_bits(struct btrfs_root *root,
                              u64 change_mask, u64 flags, u64 supported_flags,
                              u64 safe_set, u64 safe_clear)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        const char *type = btrfs_feature_set_names[set];
        char *names;
        u64 disallowed, unsupported;
@@ -5377,14 +5411,14 @@ static int check_feature_bits(struct btrfs_root *root,
        if (unsupported) {
                names = btrfs_printable_features(set, unsupported);
                if (names) {
-                       btrfs_warn(root->fs_info,
-                          "this kernel does not support the %s feature bit%s",
-                          names, strchr(names, ',') ? "s" : "");
+                       btrfs_warn(fs_info,
+                                  "this kernel does not support the %s feature bit%s",
+                                  names, strchr(names, ',') ? "s" : "");
                        kfree(names);
                } else
-                       btrfs_warn(root->fs_info,
-                          "this kernel does not support %s bits 0x%llx",
-                          type, unsupported);
+                       btrfs_warn(fs_info,
+                                  "this kernel does not support %s bits 0x%llx",
+                                  type, unsupported);
                return -EOPNOTSUPP;
        }
 
@@ -5392,14 +5426,14 @@ static int check_feature_bits(struct btrfs_root *root,
        if (disallowed) {
                names = btrfs_printable_features(set, disallowed);
                if (names) {
-                       btrfs_warn(root->fs_info,
-                          "can't set the %s feature bit%s while mounted",
-                          names, strchr(names, ',') ? "s" : "");
+                       btrfs_warn(fs_info,
+                                  "can't set the %s feature bit%s while mounted",
+                                  names, strchr(names, ',') ? "s" : "");
                        kfree(names);
                } else
-                       btrfs_warn(root->fs_info,
-                          "can't set %s bits 0x%llx while mounted",
-                          type, disallowed);
+                       btrfs_warn(fs_info,
+                                  "can't set %s bits 0x%llx while mounted",
+                                  type, disallowed);
                return -EPERM;
        }
 
@@ -5407,14 +5441,14 @@ static int check_feature_bits(struct btrfs_root *root,
        if (disallowed) {
                names = btrfs_printable_features(set, disallowed);
                if (names) {
-                       btrfs_warn(root->fs_info,
-                          "can't clear the %s feature bit%s while mounted",
-                          names, strchr(names, ',') ? "s" : "");
+                       btrfs_warn(fs_info,
+                                  "can't clear the %s feature bit%s while mounted",
+                                  names, strchr(names, ',') ? "s" : "");
                        kfree(names);
                } else
-                       btrfs_warn(root->fs_info,
-                          "can't clear %s bits 0x%llx while mounted",
-                          type, disallowed);
+                       btrfs_warn(fs_info,
+                                  "can't clear %s bits 0x%llx while mounted",
+                                  type, disallowed);
                return -EPERM;
        }
 
@@ -5429,8 +5463,10 @@ check_feature_bits(root, FEAT_##mask_base, change_mask, flags,   \
 
 static int btrfs_ioctl_set_features(struct file *file, void __user *arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
-       struct btrfs_super_block *super_block = root->fs_info->super_copy;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_super_block *super_block = fs_info->super_copy;
        struct btrfs_ioctl_feature_flags flags[2];
        struct btrfs_trans_handle *trans;
        u64 newflags;
@@ -5472,7 +5508,7 @@ static int btrfs_ioctl_set_features(struct file *file, void __user *arg)
                goto out_drop_write;
        }
 
-       spin_lock(&root->fs_info->super_lock);
+       spin_lock(&fs_info->super_lock);
        newflags = btrfs_super_compat_flags(super_block);
        newflags |= flags[0].compat_flags & flags[1].compat_flags;
        newflags &= ~(flags[0].compat_flags & ~flags[1].compat_flags);
@@ -5487,7 +5523,7 @@ static int btrfs_ioctl_set_features(struct file *file, void __user *arg)
        newflags |= flags[0].incompat_flags & flags[1].incompat_flags;
        newflags &= ~(flags[0].incompat_flags & ~flags[1].incompat_flags);
        btrfs_set_super_incompat_flags(super_block, newflags);
-       spin_unlock(&root->fs_info->super_lock);
+       spin_unlock(&fs_info->super_lock);
 
        ret = btrfs_commit_transaction(trans, root);
 out_drop_write:
@@ -5499,7 +5535,9 @@ static int btrfs_ioctl_set_features(struct file *file, void __user *arg)
 long btrfs_ioctl(struct file *file, unsigned int
                cmd, unsigned long arg)
 {
-       struct btrfs_root *root = BTRFS_I(file_inode(file))->root;
+       struct inode *inode = file_inode(file);
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        void __user *argp = (void __user *)arg;
 
        switch (cmd) {
@@ -5564,16 +5602,16 @@ long btrfs_ioctl(struct file *file, unsigned int
        case BTRFS_IOC_SYNC: {
                int ret;
 
-               ret = btrfs_start_delalloc_roots(root->fs_info, 0, -1);
+               ret = btrfs_start_delalloc_roots(fs_info, 0, -1);
                if (ret)
                        return ret;
-               ret = btrfs_sync_fs(file_inode(file)->i_sb, 1);
+               ret = btrfs_sync_fs(inode->i_sb, 1);
                /*
                 * The transaction thread may want to do more work,
                 * namely it pokes the cleaner kthread that will start
                 * processing uncleaned subvols.
                 */
-               wake_up_process(root->fs_info->transaction_kthread);
+               wake_up_process(fs_info->transaction_kthread);
                return ret;
        }
        case BTRFS_IOC_START_SYNC:
index 763bdfca4c2bbb3e3007fb3ba1629cc0516fce25..041c3326d1091d3553d8f9111f9f77c4cdea0c05 100644 (file)
@@ -186,6 +186,7 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
                                      u64 start, u64 len, u64 disk_len,
                                      int type, int dio, int compress_type)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_ordered_inode_tree *tree;
        struct rb_node *node;
@@ -234,11 +235,10 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
                      &root->ordered_extents);
        root->nr_ordered_extents++;
        if (root->nr_ordered_extents == 1) {
-               spin_lock(&root->fs_info->ordered_root_lock);
+               spin_lock(&fs_info->ordered_root_lock);
                BUG_ON(!list_empty(&root->ordered_root));
-               list_add_tail(&root->ordered_root,
-                             &root->fs_info->ordered_roots);
-               spin_unlock(&root->fs_info->ordered_root_lock);
+               list_add_tail(&root->ordered_root, &fs_info->ordered_roots);
+               spin_unlock(&fs_info->ordered_root_lock);
        }
        spin_unlock(&root->ordered_extent_lock);
 
@@ -303,6 +303,7 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode,
                                   struct btrfs_ordered_extent **cached,
                                   u64 *file_offset, u64 io_size, int uptodate)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ordered_inode_tree *tree;
        struct rb_node *node;
        struct btrfs_ordered_extent *entry = NULL;
@@ -331,14 +332,14 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode,
                      entry->len);
        *file_offset = dec_end;
        if (dec_start > dec_end) {
-               btrfs_crit(BTRFS_I(inode)->root->fs_info,
-                       "bad ordering dec_start %llu end %llu", dec_start, dec_end);
+               btrfs_crit(fs_info, "bad ordering dec_start %llu end %llu",
+                          dec_start, dec_end);
        }
        to_dec = dec_end - dec_start;
        if (to_dec > entry->bytes_left) {
-               btrfs_crit(BTRFS_I(inode)->root->fs_info,
-                       "bad ordered accounting left %llu size %llu",
-                       entry->bytes_left, to_dec);
+               btrfs_crit(fs_info,
+                          "bad ordered accounting left %llu size %llu",
+                          entry->bytes_left, to_dec);
        }
        entry->bytes_left -= to_dec;
        if (!uptodate)
@@ -588,6 +589,7 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry)
 void btrfs_remove_ordered_extent(struct inode *inode,
                                 struct btrfs_ordered_extent *entry)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ordered_inode_tree *tree;
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct rb_node *node;
@@ -618,11 +620,11 @@ void btrfs_remove_ordered_extent(struct inode *inode,
                 * lock, so be nice and check if trans is set, but ASSERT() so
                 * if it isn't set a developer will notice.
                 */
-               spin_lock(&root->fs_info->trans_lock);
-               trans = root->fs_info->running_transaction;
+               spin_lock(&fs_info->trans_lock);
+               trans = fs_info->running_transaction;
                if (trans)
                        atomic_inc(&trans->use_count);
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
 
                ASSERT(trans);
                if (trans) {
@@ -639,10 +641,10 @@ void btrfs_remove_ordered_extent(struct inode *inode,
        trace_btrfs_ordered_extent_remove(inode, entry);
 
        if (!root->nr_ordered_extents) {
-               spin_lock(&root->fs_info->ordered_root_lock);
+               spin_lock(&fs_info->ordered_root_lock);
                BUG_ON(list_empty(&root->ordered_root));
                list_del_init(&root->ordered_root);
-               spin_unlock(&root->fs_info->ordered_root_lock);
+               spin_unlock(&fs_info->ordered_root_lock);
        }
        spin_unlock(&root->ordered_extent_lock);
        wake_up(&entry->wait);
@@ -664,6 +666,7 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work)
 int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr,
                               const u64 range_start, const u64 range_len)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        LIST_HEAD(splice);
        LIST_HEAD(skipped);
        LIST_HEAD(works);
@@ -694,8 +697,7 @@ int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr,
                                btrfs_flush_delalloc_helper,
                                btrfs_run_ordered_extent_work, NULL, NULL);
                list_add_tail(&ordered->work_list, &works);
-               btrfs_queue_work(root->fs_info->flush_workers,
-                                &ordered->flush_work);
+               btrfs_queue_work(fs_info->flush_workers, &ordered->flush_work);
 
                cond_resched();
                spin_lock(&root->ordered_extent_lock);
index 57c403b205a5d65e8d615aa4101ba99c57375e6f..3251a0dd03a204753f277fcbef285d3747db1e9c 100644 (file)
@@ -163,6 +163,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset,
 
 void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int i;
        u32 type, nr;
        struct btrfs_item *item;
@@ -182,7 +183,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
 
        nr = btrfs_header_nritems(l);
 
-       btrfs_info(root->fs_info, "leaf %llu total ptrs %d free space %d",
+       btrfs_info(fs_info, "leaf %llu total ptrs %d free space %d",
                   btrfs_header_bytenr(l), nr, btrfs_leaf_free_space(root, l));
        for (i = 0 ; i < nr ; i++) {
                item = btrfs_item_nr(i);
@@ -316,6 +317,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
 
 void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int i; u32 nr;
        struct btrfs_key key;
        int level;
@@ -328,10 +330,10 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
                btrfs_print_leaf(root, c);
                return;
        }
-       btrfs_info(root->fs_info,
+       btrfs_info(fs_info,
                   "node %llu level %d total ptrs %d free spc %u",
                   btrfs_header_bytenr(c), level, nr,
-                  (u32)BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - nr);
+                  (u32)BTRFS_NODEPTRS_PER_BLOCK(fs_info) - nr);
        for (i = 0; i < nr; i++) {
                btrfs_node_key_to_cpu(c, &key, i);
                pr_info("\tkey %d (%llu %u %llu) block %llu\n",
index 1fd9bef8cf3bce9da51a91b559bae47120538b40..eb389b1452ae2fe3d8d834a9faaf21aa03b825c4 100644 (file)
@@ -1019,7 +1019,7 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans,
        list_del(&quota_root->dirty_list);
 
        btrfs_tree_lock(quota_root->node);
-       clean_tree_block(trans, tree_root->fs_info, quota_root->node);
+       clean_tree_block(trans, fs_info, quota_root->node);
        btrfs_tree_unlock(quota_root->node);
        btrfs_free_tree_block(trans, quota_root, quota_root->node, 0, 1);
 
@@ -1192,7 +1192,7 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
        }
 
        spin_lock(&fs_info->qgroup_lock);
-       ret = add_relation_rb(quota_root->fs_info, src, dst);
+       ret = add_relation_rb(fs_info, src, dst);
        if (ret < 0) {
                spin_unlock(&fs_info->qgroup_lock);
                goto out;
@@ -1340,7 +1340,7 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,
        }
 
        spin_lock(&fs_info->qgroup_lock);
-       del_qgroup_rb(quota_root->fs_info, qgroupid);
+       del_qgroup_rb(fs_info, qgroupid);
        spin_unlock(&fs_info->qgroup_lock);
 out:
        mutex_unlock(&fs_info->qgroup_ioctl_lock);
@@ -1521,6 +1521,7 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
                                  struct btrfs_root *root,
                                  struct extent_buffer *eb)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int nr = btrfs_header_nritems(eb);
        int i, extent_type, ret;
        struct btrfs_key key;
@@ -1528,7 +1529,7 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
        u64 bytenr, num_bytes;
 
        /* We can be called directly from walk_up_proc() */
-       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &root->fs_info->flags))
+       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags))
                return 0;
 
        for (i = 0; i < nr; i++) {
@@ -1550,8 +1551,8 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
 
                num_bytes = btrfs_file_extent_disk_num_bytes(eb, fi);
 
-               ret = btrfs_qgroup_trace_extent(trans, root->fs_info,
-                                               bytenr, num_bytes, GFP_NOFS);
+               ret = btrfs_qgroup_trace_extent(trans, fs_info, bytenr,
+                                               num_bytes, GFP_NOFS);
                if (ret)
                        return ret;
        }
@@ -1625,6 +1626,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
                               struct extent_buffer *root_eb,
                               u64 root_gen, int root_level)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret = 0;
        int level;
        struct extent_buffer *eb = root_eb;
@@ -1633,7 +1635,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
        BUG_ON(root_level < 0 || root_level > BTRFS_MAX_LEVEL);
        BUG_ON(root_eb == NULL);
 
-       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &root->fs_info->flags))
+       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags))
                return 0;
 
        if (!extent_buffer_uptodate(root_eb)) {
@@ -1698,9 +1700,10 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
                        btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
                        path->locks[level] = BTRFS_READ_LOCK_BLOCKING;
 
-                       ret = btrfs_qgroup_trace_extent(trans,
-                                       root->fs_info, child_bytenr,
-                                       root->fs_info->nodesize, GFP_NOFS);
+                       ret = btrfs_qgroup_trace_extent(trans, fs_info,
+                                                       child_bytenr,
+                                                       fs_info->nodesize,
+                                                       GFP_NOFS);
                        if (ret)
                                goto out;
                }
@@ -2170,7 +2173,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
                }
 
                rcu_read_lock();
-               level_size = srcroot->fs_info->nodesize;
+               level_size = fs_info->nodesize;
                rcu_read_unlock();
        }
 
@@ -2254,8 +2257,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
        i_qgroups = (u64 *)(inherit + 1);
        for (i = 0; i < inherit->num_qgroups; ++i) {
                if (*i_qgroups) {
-                       ret = add_relation_rb(quota_root->fs_info, objectid,
-                                             *i_qgroups);
+                       ret = add_relation_rb(fs_info, objectid, *i_qgroups);
                        if (ret)
                                goto unlock;
                }
@@ -2897,13 +2899,14 @@ int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len)
 
 int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
 
-       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &root->fs_info->flags) ||
+       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) ||
            !is_fstree(root->objectid) || num_bytes == 0)
                return 0;
 
-       BUG_ON(num_bytes != round_down(num_bytes, root->fs_info->nodesize));
+       BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize));
        ret = qgroup_reserve(root, num_bytes);
        if (ret < 0)
                return ret;
@@ -2913,9 +2916,10 @@ int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes)
 
 void btrfs_qgroup_free_meta_all(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int reserved;
 
-       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &root->fs_info->flags) ||
+       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) ||
            !is_fstree(root->objectid))
                return;
 
@@ -2927,11 +2931,13 @@ void btrfs_qgroup_free_meta_all(struct btrfs_root *root)
 
 void btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes)
 {
-       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &root->fs_info->flags) ||
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) ||
            !is_fstree(root->objectid))
                return;
 
-       BUG_ON(num_bytes != round_down(num_bytes, root->fs_info->nodesize));
+       BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize));
        WARN_ON(atomic_read(&root->qgroup_meta_rsv) < num_bytes);
        atomic_sub(num_bytes, &root->qgroup_meta_rsv);
        qgroup_free(root, num_bytes);
index 6e9e21da23e77616bb934e818e605ec510214361..9a67346b48f53ce286afab7e96055ae26e1b9b03 100644 (file)
@@ -1478,11 +1478,8 @@ static void raid_rmw_end_io(struct bio *bio)
 
 static void async_rmw_stripe(struct btrfs_raid_bio *rbio)
 {
-       btrfs_init_work(&rbio->work, btrfs_rmw_helper,
-                       rmw_work, NULL, NULL);
-
-       btrfs_queue_work(rbio->fs_info->rmw_workers,
-                        &rbio->work);
+       btrfs_init_work(&rbio->work, btrfs_rmw_helper, rmw_work, NULL, NULL);
+       btrfs_queue_work(rbio->fs_info->rmw_workers, &rbio->work);
 }
 
 static void async_read_rebuild(struct btrfs_raid_bio *rbio)
@@ -1490,8 +1487,7 @@ static void async_read_rebuild(struct btrfs_raid_bio *rbio)
        btrfs_init_work(&rbio->work, btrfs_rmw_helper,
                        read_rebuild_work, NULL, NULL);
 
-       btrfs_queue_work(rbio->fs_info->rmw_workers,
-                        &rbio->work);
+       btrfs_queue_work(rbio->fs_info->rmw_workers, &rbio->work);
 }
 
 /*
@@ -1573,8 +1569,7 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
                bio->bi_end_io = raid_rmw_end_io;
                bio_set_op_attrs(bio, REQ_OP_READ, 0);
 
-               btrfs_bio_wq_end_io(rbio->fs_info, bio,
-                                   BTRFS_WQ_ENDIO_RAID56);
+               btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
 
                submit_bio(bio);
        }
@@ -1742,6 +1737,7 @@ static void btrfs_raid_unplug(struct blk_plug_cb *cb, bool from_schedule)
 int raid56_parity_write(struct btrfs_root *root, struct bio *bio,
                        struct btrfs_bio *bbio, u64 stripe_len)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_raid_bio *rbio;
        struct btrfs_plug_cb *plug = NULL;
        struct blk_plug_cb *cb;
@@ -1756,7 +1752,7 @@ int raid56_parity_write(struct btrfs_root *root, struct bio *bio,
        rbio->bio_list_bytes = bio->bi_iter.bi_size;
        rbio->operation = BTRFS_RBIO_WRITE;
 
-       btrfs_bio_counter_inc_noblocked(root->fs_info);
+       btrfs_bio_counter_inc_noblocked(fs_info);
        rbio->generic_bio_cnt = 1;
 
        /*
@@ -1766,16 +1762,15 @@ int raid56_parity_write(struct btrfs_root *root, struct bio *bio,
        if (rbio_is_full(rbio)) {
                ret = full_stripe_write(rbio);
                if (ret)
-                       btrfs_bio_counter_dec(root->fs_info);
+                       btrfs_bio_counter_dec(fs_info);
                return ret;
        }
 
-       cb = blk_check_plugged(btrfs_raid_unplug, root->fs_info,
-                              sizeof(*plug));
+       cb = blk_check_plugged(btrfs_raid_unplug, fs_info, sizeof(*plug));
        if (cb) {
                plug = container_of(cb, struct btrfs_plug_cb, cb);
                if (!plug->info) {
-                       plug->info = root->fs_info;
+                       plug->info = fs_info;
                        INIT_LIST_HEAD(&plug->rbio_list);
                }
                list_add_tail(&rbio->plug_list, &plug->rbio_list);
@@ -1783,7 +1778,7 @@ int raid56_parity_write(struct btrfs_root *root, struct bio *bio,
        } else {
                ret = __raid56_parity_write(rbio);
                if (ret)
-                       btrfs_bio_counter_dec(root->fs_info);
+                       btrfs_bio_counter_dec(fs_info);
        }
        return ret;
 }
@@ -2098,8 +2093,7 @@ static int __raid56_parity_recover(struct btrfs_raid_bio *rbio)
                bio->bi_end_io = raid_recover_end_io;
                bio_set_op_attrs(bio, REQ_OP_READ, 0);
 
-               btrfs_bio_wq_end_io(rbio->fs_info, bio,
-                                   BTRFS_WQ_ENDIO_RAID56);
+               btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
 
                submit_bio(bio);
        }
@@ -2123,6 +2117,7 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio,
                          struct btrfs_bio *bbio, u64 stripe_len,
                          int mirror_num, int generic_io)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_raid_bio *rbio;
        int ret;
 
@@ -2139,7 +2134,7 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio,
 
        rbio->faila = find_logical_bio_stripe(rbio, bio);
        if (rbio->faila == -1) {
-               btrfs_warn(root->fs_info,
+               btrfs_warn(fs_info,
        "%s could not find the bad stripe in raid56 so that we cannot recover any more (bio has logical %llu len %llu, bbio has map_type %llu)",
                           __func__, (u64)bio->bi_iter.bi_sector << 9,
                           (u64)bio->bi_iter.bi_size, bbio->map_type);
@@ -2150,7 +2145,7 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio,
        }
 
        if (generic_io) {
-               btrfs_bio_counter_inc_noblocked(root->fs_info);
+               btrfs_bio_counter_inc_noblocked(fs_info);
                rbio->generic_bio_cnt = 1;
        } else {
                btrfs_get_bbio(bbio);
@@ -2213,6 +2208,7 @@ raid56_parity_alloc_scrub_rbio(struct btrfs_root *root, struct bio *bio,
                               struct btrfs_device *scrub_dev,
                               unsigned long *dbitmap, int stripe_nsectors)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_raid_bio *rbio;
        int i;
 
@@ -2235,7 +2231,7 @@ raid56_parity_alloc_scrub_rbio(struct btrfs_root *root, struct bio *bio,
        }
 
        /* Now we just support the sectorsize equals to page size */
-       ASSERT(root->fs_info->sectorsize == PAGE_SIZE);
+       ASSERT(fs_info->sectorsize == PAGE_SIZE);
        ASSERT(rbio->stripe_npages == stripe_nsectors);
        bitmap_copy(rbio->dbitmap, dbitmap, stripe_nsectors);
 
@@ -2617,8 +2613,7 @@ static void raid56_parity_scrub_stripe(struct btrfs_raid_bio *rbio)
                bio->bi_end_io = raid56_parity_scrub_end_io;
                bio_set_op_attrs(bio, REQ_OP_READ, 0);
 
-               btrfs_bio_wq_end_io(rbio->fs_info, bio,
-                                   BTRFS_WQ_ENDIO_RAID56);
+               btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
 
                submit_bio(bio);
        }
@@ -2646,8 +2641,7 @@ static void async_scrub_parity(struct btrfs_raid_bio *rbio)
        btrfs_init_work(&rbio->work, btrfs_rmw_helper,
                        scrub_parity_work, NULL, NULL);
 
-       btrfs_queue_work(rbio->fs_info->rmw_workers,
-                        &rbio->work);
+       btrfs_queue_work(rbio->fs_info->rmw_workers, &rbio->work);
 }
 
 void raid56_parity_submit_scrub_rbio(struct btrfs_raid_bio *rbio)
index c51292abbd039125502a63cbe24e33c6cc6604fc..8d36fb457594f0b93ac02157d12207e7cd94383b 100644 (file)
@@ -335,7 +335,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,
        if (!re)
                return NULL;
 
-       blocksize = root->fs_info->nodesize;
+       blocksize = fs_info->nodesize;
        re->logical = logical;
        re->top = *top;
        INIT_LIST_HEAD(&re->extctl);
@@ -352,7 +352,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,
                goto error;
 
        if (bbio->num_stripes > BTRFS_MAX_MIRRORS) {
-               btrfs_err(root->fs_info,
+               btrfs_err(fs_info,
                           "readahead: more than %d copies not supported",
                           BTRFS_MAX_MIRRORS);
                goto error;
@@ -950,11 +950,10 @@ int btrfs_reada_wait(void *handle)
                        reada_start_machine(fs_info);
                wait_event_timeout(rc->wait, atomic_read(&rc->elems) == 0,
                                   5 * HZ);
-               dump_devs(rc->root->fs_info,
-                         atomic_read(&rc->elems) < 10 ? 1 : 0);
+               dump_devs(fs_info, atomic_read(&rc->elems) < 10 ? 1 : 0);
        }
 
-       dump_devs(rc->root->fs_info, atomic_read(&rc->elems) < 10 ? 1 : 0);
+       dump_devs(fs_info, atomic_read(&rc->elems) < 10 ? 1 : 0);
 
        kref_put(&rc->refcnt, reada_control_release);
 
index a515591388503ad8808e44fe5c6f319bb2127647..bc6ccd3a605180e7dcb45bed2dcb1a1fe48490a4 100644 (file)
@@ -1288,9 +1288,10 @@ static int clone_backref_node(struct btrfs_trans_handle *trans,
  */
 static int __must_check __add_reloc_root(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *rb_node;
        struct mapping_node *node;
-       struct reloc_control *rc = root->fs_info->reloc_ctl;
+       struct reloc_control *rc = fs_info->reloc_ctl;
 
        node = kmalloc(sizeof(*node), GFP_NOFS);
        if (!node)
@@ -1304,7 +1305,7 @@ static int __must_check __add_reloc_root(struct btrfs_root *root)
                              node->bytenr, &node->rb_node);
        spin_unlock(&rc->reloc_root_tree.lock);
        if (rb_node) {
-               btrfs_panic(root->fs_info, -EEXIST,
+               btrfs_panic(fs_info, -EEXIST,
                            "Duplicate root found for start=%llu while inserting into relocation tree",
                            node->bytenr);
                kfree(node);
@@ -1321,9 +1322,10 @@ static int __must_check __add_reloc_root(struct btrfs_root *root)
  */
 static void __del_reloc_root(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *rb_node;
        struct mapping_node *node = NULL;
-       struct reloc_control *rc = root->fs_info->reloc_ctl;
+       struct reloc_control *rc = fs_info->reloc_ctl;
 
        spin_lock(&rc->reloc_root_tree.lock);
        rb_node = tree_search(&rc->reloc_root_tree.rb_root,
@@ -1338,9 +1340,9 @@ static void __del_reloc_root(struct btrfs_root *root)
                return;
        BUG_ON((struct btrfs_root *)node->data != root);
 
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
        list_del_init(&root->root_list);
-       spin_unlock(&root->fs_info->trans_lock);
+       spin_unlock(&fs_info->trans_lock);
        kfree(node);
 }
 
@@ -1350,9 +1352,10 @@ static void __del_reloc_root(struct btrfs_root *root)
  */
 static int __update_reloc_root(struct btrfs_root *root, u64 new_bytenr)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *rb_node;
        struct mapping_node *node = NULL;
-       struct reloc_control *rc = root->fs_info->reloc_ctl;
+       struct reloc_control *rc = fs_info->reloc_ctl;
 
        spin_lock(&rc->reloc_root_tree.lock);
        rb_node = tree_search(&rc->reloc_root_tree.rb_root,
@@ -1380,6 +1383,7 @@ static int __update_reloc_root(struct btrfs_root *root, u64 new_bytenr)
 static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,
                                        struct btrfs_root *root, u64 objectid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *reloc_root;
        struct extent_buffer *eb;
        struct btrfs_root_item *root_item;
@@ -1437,12 +1441,12 @@ static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,
        btrfs_tree_unlock(eb);
        free_extent_buffer(eb);
 
-       ret = btrfs_insert_root(trans, root->fs_info->tree_root,
+       ret = btrfs_insert_root(trans, fs_info->tree_root,
                                &root_key, root_item);
        BUG_ON(ret);
        kfree(root_item);
 
-       reloc_root = btrfs_read_fs_root(root->fs_info->tree_root, &root_key);
+       reloc_root = btrfs_read_fs_root(fs_info->tree_root, &root_key);
        BUG_ON(IS_ERR(reloc_root));
        reloc_root->last_trans = trans->transid;
        return reloc_root;
@@ -1455,8 +1459,9 @@ static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,
 int btrfs_init_reloc_root(struct btrfs_trans_handle *trans,
                          struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *reloc_root;
-       struct reloc_control *rc = root->fs_info->reloc_ctl;
+       struct reloc_control *rc = fs_info->reloc_ctl;
        struct btrfs_block_rsv *rsv;
        int clear_rsv = 0;
        int ret;
@@ -1492,6 +1497,7 @@ int btrfs_init_reloc_root(struct btrfs_trans_handle *trans,
 int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *reloc_root;
        struct btrfs_root_item *root_item;
        int ret;
@@ -1502,7 +1508,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,
        reloc_root = root->reloc_root;
        root_item = &reloc_root->root_item;
 
-       if (root->fs_info->reloc_ctl->merge_reloc_tree &&
+       if (fs_info->reloc_ctl->merge_reloc_tree &&
            btrfs_root_refs(root_item) == 0) {
                root->reloc_root = NULL;
                __del_reloc_root(reloc_root);
@@ -1514,7 +1520,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,
                reloc_root->commit_root = btrfs_root_node(reloc_root);
        }
 
-       ret = btrfs_update_root(trans, root->fs_info->tree_root,
+       ret = btrfs_update_root(trans, fs_info->tree_root,
                                &reloc_root->root_key, root_item);
        BUG_ON(ret);
 
@@ -1642,6 +1648,7 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
                         struct btrfs_root *root,
                         struct extent_buffer *leaf)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key key;
        struct btrfs_file_extent_item *fi;
        struct inode *inode = NULL;
@@ -1698,8 +1705,8 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
                                end = key.offset +
                                      btrfs_file_extent_num_bytes(leaf, fi);
                                WARN_ON(!IS_ALIGNED(key.offset,
-                                                   root->fs_info->sectorsize));
-                               WARN_ON(!IS_ALIGNED(end, root->fs_info->sectorsize));
+                                                   fs_info->sectorsize));
+                               WARN_ON(!IS_ALIGNED(end, fs_info->sectorsize));
                                end--;
                                ret = try_lock_extent(&BTRFS_I(inode)->io_tree,
                                                      key.offset, end);
@@ -1777,6 +1784,7 @@ int replace_path(struct btrfs_trans_handle *trans,
                 struct btrfs_path *path, struct btrfs_key *next_key,
                 int lowest_level, int max_level)
 {
+       struct btrfs_fs_info *fs_info = dest->fs_info;
        struct extent_buffer *eb;
        struct extent_buffer *parent;
        struct btrfs_key key;
@@ -1834,7 +1842,7 @@ int replace_path(struct btrfs_trans_handle *trans,
                        btrfs_node_key_to_cpu(parent, next_key, slot + 1);
 
                old_bytenr = btrfs_node_blockptr(parent, slot);
-               blocksize = dest->fs_info->nodesize;
+               blocksize = fs_info->nodesize;
                old_ptr_gen = btrfs_node_ptr_generation(parent, slot);
 
                if (level <= max_level) {
@@ -2061,6 +2069,7 @@ static int invalidate_extent_cache(struct btrfs_root *root,
                                   struct btrfs_key *min_key,
                                   struct btrfs_key *max_key)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct inode *inode = NULL;
        u64 objectid;
        u64 start, end;
@@ -2095,7 +2104,7 @@ static int invalidate_extent_cache(struct btrfs_root *root,
                                start = 0;
                        else {
                                start = min_key->offset;
-                               WARN_ON(!IS_ALIGNED(start, root->fs_info->sectorsize));
+                               WARN_ON(!IS_ALIGNED(start, fs_info->sectorsize));
                        }
                } else {
                        start = 0;
@@ -2110,7 +2119,7 @@ static int invalidate_extent_cache(struct btrfs_root *root,
                                if (max_key->offset == 0)
                                        continue;
                                end = max_key->offset;
-                               WARN_ON(!IS_ALIGNED(end, root->fs_info->sectorsize));
+                               WARN_ON(!IS_ALIGNED(end, fs_info->sectorsize));
                                end--;
                        }
                } else {
@@ -2150,6 +2159,7 @@ static int find_next_key(struct btrfs_path *path, int level,
 static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,
                                               struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
        LIST_HEAD(inode_list);
        struct btrfs_key key;
        struct btrfs_key next_key;
@@ -2198,7 +2208,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,
                btrfs_unlock_up_safe(path, 0);
        }
 
-       min_reserved = root->fs_info->nodesize * (BTRFS_MAX_LEVEL - 1) * 2;
+       min_reserved = fs_info->nodesize * (BTRFS_MAX_LEVEL - 1) * 2;
        memset(&next_key, 0, sizeof(next_key));
 
        while (1) {
@@ -2304,16 +2314,17 @@ static noinline_for_stack
 int prepare_to_merge(struct reloc_control *rc, int err)
 {
        struct btrfs_root *root = rc->extent_root;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *reloc_root;
        struct btrfs_trans_handle *trans;
        LIST_HEAD(reloc_roots);
        u64 num_bytes = 0;
        int ret;
 
-       mutex_lock(&root->fs_info->reloc_mutex);
-       rc->merging_rsv_size += root->fs_info->nodesize * (BTRFS_MAX_LEVEL - 1) * 2;
+       mutex_lock(&fs_info->reloc_mutex);
+       rc->merging_rsv_size += fs_info->nodesize * (BTRFS_MAX_LEVEL - 1) * 2;
        rc->merging_rsv_size += rc->nodes_relocated * 2;
-       mutex_unlock(&root->fs_info->reloc_mutex);
+       mutex_unlock(&fs_info->reloc_mutex);
 
 again:
        if (!err) {
@@ -2348,8 +2359,7 @@ int prepare_to_merge(struct reloc_control *rc, int err)
                                        struct btrfs_root, root_list);
                list_del_init(&reloc_root->root_list);
 
-               root = read_fs_root(reloc_root->fs_info,
-                                   reloc_root->root_key.offset);
+               root = read_fs_root(fs_info, reloc_root->root_key.offset);
                BUG_ON(IS_ERR(root));
                BUG_ON(root->reloc_root != reloc_root);
 
@@ -2392,6 +2402,7 @@ void free_reloc_roots(struct list_head *list)
 static noinline_for_stack
 void merge_reloc_roots(struct reloc_control *rc)
 {
+       struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
        struct btrfs_root *root;
        struct btrfs_root *reloc_root;
        u64 last_snap;
@@ -2409,9 +2420,9 @@ void merge_reloc_roots(struct reloc_control *rc)
         * adding their roots to the list while we are
         * doing this splice
         */
-       mutex_lock(&root->fs_info->reloc_mutex);
+       mutex_lock(&fs_info->reloc_mutex);
        list_splice_init(&rc->reloc_roots, &reloc_roots);
-       mutex_unlock(&root->fs_info->reloc_mutex);
+       mutex_unlock(&fs_info->reloc_mutex);
 
        while (!list_empty(&reloc_roots)) {
                found = 1;
@@ -2419,7 +2430,7 @@ void merge_reloc_roots(struct reloc_control *rc)
                                        struct btrfs_root, root_list);
 
                if (btrfs_root_refs(&reloc_root->root_item) > 0) {
-                       root = read_fs_root(reloc_root->fs_info,
+                       root = read_fs_root(fs_info,
                                            reloc_root->root_key.offset);
                        BUG_ON(IS_ERR(root));
                        BUG_ON(root->reloc_root != reloc_root);
@@ -2458,14 +2469,14 @@ void merge_reloc_roots(struct reloc_control *rc)
        }
 out:
        if (ret) {
-               btrfs_handle_fs_error(root->fs_info, ret, NULL);
+               btrfs_handle_fs_error(fs_info, ret, NULL);
                if (!list_empty(&reloc_roots))
                        free_reloc_roots(&reloc_roots);
 
                /* new reloc root may be added */
-               mutex_lock(&root->fs_info->reloc_mutex);
+               mutex_lock(&fs_info->reloc_mutex);
                list_splice_init(&rc->reloc_roots, &reloc_roots);
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                if (!list_empty(&reloc_roots))
                        free_reloc_roots(&reloc_roots);
        }
@@ -2487,12 +2498,13 @@ static void free_block_list(struct rb_root *blocks)
 static int record_reloc_root_in_trans(struct btrfs_trans_handle *trans,
                                      struct btrfs_root *reloc_root)
 {
+       struct btrfs_fs_info *fs_info = reloc_root->fs_info;
        struct btrfs_root *root;
 
        if (reloc_root->last_trans == trans->transid)
                return 0;
 
-       root = read_fs_root(reloc_root->fs_info, reloc_root->root_key.offset);
+       root = read_fs_root(fs_info, reloc_root->root_key.offset);
        BUG_ON(IS_ERR(root));
        BUG_ON(root->reloc_root != reloc_root);
 
@@ -2602,6 +2614,7 @@ static noinline_for_stack
 u64 calcu_metadata_size(struct reloc_control *rc,
                        struct backref_node *node, int reserve)
 {
+       struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
        struct backref_node *next = node;
        struct backref_edge *edge;
        struct backref_edge *edges[BTRFS_MAX_LEVEL - 1];
@@ -2616,7 +2629,7 @@ u64 calcu_metadata_size(struct reloc_control *rc,
                        if (next->processed && (reserve || next != node))
                                break;
 
-                       num_bytes += rc->extent_root->fs_info->nodesize;
+                       num_bytes += fs_info->nodesize;
 
                        if (list_empty(&next->upper))
                                break;
@@ -3131,7 +3144,7 @@ static noinline_for_stack
 int setup_extent_mapping(struct inode *inode, u64 start, u64 end,
                         u64 block_start)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
        struct extent_map *em;
        int ret = 0;
@@ -3144,7 +3157,7 @@ int setup_extent_mapping(struct inode *inode, u64 start, u64 end,
        em->len = end + 1 - start;
        em->block_len = em->len;
        em->block_start = block_start;
-       em->bdev = root->fs_info->fs_devices->latest_bdev;
+       em->bdev = fs_info->fs_devices->latest_bdev;
        set_bit(EXTENT_FLAG_PINNED, &em->flags);
 
        lock_extent(&BTRFS_I(inode)->io_tree, start, end);
@@ -3419,11 +3432,11 @@ static int __add_tree_block(struct reloc_control *rc,
                            u64 bytenr, u32 blocksize,
                            struct rb_root *blocks)
 {
+       struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
        struct btrfs_path *path;
        struct btrfs_key key;
        int ret;
-       bool skinny = btrfs_fs_incompat(rc->extent_root->fs_info,
-                                       SKINNY_METADATA);
+       bool skinny = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
 
        if (tree_block_processed(bytenr, rc))
                return 0;
@@ -3556,6 +3569,7 @@ static int find_data_references(struct reloc_control *rc,
                                struct btrfs_extent_data_ref *ref,
                                struct rb_root *blocks)
 {
+       struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
        struct btrfs_path *path;
        struct tree_block *block;
        struct btrfs_root *root;
@@ -3582,8 +3596,7 @@ static int find_data_references(struct reloc_control *rc,
         * it and redo the search.
         */
        if (ref_root == BTRFS_ROOT_TREE_OBJECTID) {
-               ret = delete_block_group_cache(rc->extent_root->fs_info,
-                                              rc->block_group,
+               ret = delete_block_group_cache(fs_info, rc->block_group,
                                               NULL, ref_objectid);
                if (ret != -ENOENT)
                        return ret;
@@ -3595,7 +3608,7 @@ static int find_data_references(struct reloc_control *rc,
                return -ENOMEM;
        path->reada = READA_FORWARD;
 
-       root = read_fs_root(rc->extent_root->fs_info, ref_root);
+       root = read_fs_root(fs_info, ref_root);
        if (IS_ERR(root)) {
                err = PTR_ERR(root);
                goto out;
@@ -3821,6 +3834,7 @@ static noinline_for_stack
 int find_next_extent(struct reloc_control *rc, struct btrfs_path *path,
                     struct btrfs_key *extent_key)
 {
+       struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
        struct btrfs_key key;
        struct extent_buffer *leaf;
        u64 start, end, last;
@@ -3872,7 +3886,7 @@ int find_next_extent(struct reloc_control *rc, struct btrfs_path *path,
                }
 
                if (key.type == BTRFS_METADATA_ITEM_KEY &&
-                   key.objectid + rc->extent_root->fs_info->nodesize <=
+                   key.objectid + fs_info->nodesize <=
                    rc->search_start) {
                        path->slots[0]++;
                        goto next;
@@ -3890,7 +3904,7 @@ int find_next_extent(struct reloc_control *rc, struct btrfs_path *path,
                                rc->search_start = key.objectid + key.offset;
                        else
                                rc->search_start = key.objectid +
-                                       rc->extent_root->fs_info->nodesize;
+                                       fs_info->nodesize;
                        memcpy(extent_key, &key, sizeof(key));
                        return 0;
                }
@@ -4233,7 +4247,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
        key.objectid = objectid;
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
-       inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);
+       inode = btrfs_iget(fs_info->sb, &key, root, NULL);
        BUG_ON(IS_ERR(inode) || is_bad_inode(inode));
        BTRFS_I(inode)->index_cnt = group->key.objectid;
 
@@ -4360,7 +4374,7 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)
                goto out;
        }
 
-       describe_relocation(extent_root->fs_info, rc->block_group);
+       describe_relocation(fs_info, rc->block_group);
 
        btrfs_wait_block_group_reservations(rc->block_group);
        btrfs_wait_nocow_writers(rc->block_group);
@@ -4380,8 +4394,7 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)
                if (rc->extents_found == 0)
                        break;
 
-               btrfs_info(extent_root->fs_info, "found %llu extents",
-                       rc->extents_found);
+               btrfs_info(fs_info, "found %llu extents", rc->extents_found);
 
                if (rc->stage == MOVE_DATA_EXTENTS && rc->found_file_extent) {
                        ret = btrfs_wait_ordered_range(rc->data_inode, 0,
@@ -4410,10 +4423,11 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)
 
 static noinline_for_stack int mark_garbage_root(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_trans_handle *trans;
        int ret, err;
 
-       trans = btrfs_start_transaction(root->fs_info->tree_root, 0);
+       trans = btrfs_start_transaction(fs_info->tree_root, 0);
        if (IS_ERR(trans))
                return PTR_ERR(trans);
 
@@ -4421,10 +4435,10 @@ static noinline_for_stack int mark_garbage_root(struct btrfs_root *root)
                sizeof(root->root_item.drop_progress));
        root->root_item.drop_level = 0;
        btrfs_set_root_refs(&root->root_item, 0);
-       ret = btrfs_update_root(trans, root->fs_info->tree_root,
+       ret = btrfs_update_root(trans, fs_info->tree_root,
                                &root->root_key, &root->root_item);
 
-       err = btrfs_end_transaction(trans, root->fs_info->tree_root);
+       err = btrfs_end_transaction(trans, fs_info->tree_root);
        if (err)
                return err;
        return ret;
@@ -4438,6 +4452,7 @@ static noinline_for_stack int mark_garbage_root(struct btrfs_root *root)
  */
 int btrfs_recover_relocation(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        LIST_HEAD(reloc_roots);
        struct btrfs_key key;
        struct btrfs_root *fs_root;
@@ -4459,7 +4474,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
        key.offset = (u64)-1;
 
        while (1) {
-               ret = btrfs_search_slot(NULL, root->fs_info->tree_root, &key,
+               ret = btrfs_search_slot(NULL, fs_info->tree_root, &key,
                                        path, 0, 0);
                if (ret < 0) {
                        err = ret;
@@ -4487,7 +4502,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
                list_add(&reloc_root->root_list, &reloc_roots);
 
                if (btrfs_root_refs(&reloc_root->root_item) > 0) {
-                       fs_root = read_fs_root(root->fs_info,
+                       fs_root = read_fs_root(fs_info,
                                               reloc_root->root_key.offset);
                        if (IS_ERR(fs_root)) {
                                ret = PTR_ERR(fs_root);
@@ -4513,13 +4528,13 @@ int btrfs_recover_relocation(struct btrfs_root *root)
        if (list_empty(&reloc_roots))
                goto out;
 
-       rc = alloc_reloc_control(root->fs_info);
+       rc = alloc_reloc_control(fs_info);
        if (!rc) {
                err = -ENOMEM;
                goto out;
        }
 
-       rc->extent_root = root->fs_info->extent_root;
+       rc->extent_root = fs_info->extent_root;
 
        set_reloc_control(rc);
 
@@ -4543,8 +4558,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
                        continue;
                }
 
-               fs_root = read_fs_root(root->fs_info,
-                                      reloc_root->root_key.offset);
+               fs_root = read_fs_root(fs_info, reloc_root->root_key.offset);
                if (IS_ERR(fs_root)) {
                        err = PTR_ERR(fs_root);
                        goto out_free;
@@ -4579,8 +4593,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
 
        if (err == 0) {
                /* cleanup orphan inode in data relocation tree */
-               fs_root = read_fs_root(root->fs_info,
-                                      BTRFS_DATA_RELOC_TREE_OBJECTID);
+               fs_root = read_fs_root(fs_info, BTRFS_DATA_RELOC_TREE_OBJECTID);
                if (IS_ERR(fs_root))
                        err = PTR_ERR(fs_root);
                else
@@ -4597,9 +4610,9 @@ int btrfs_recover_relocation(struct btrfs_root *root)
  */
 int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_ordered_sum *sums;
        struct btrfs_ordered_extent *ordered;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
        int ret;
        u64 disk_bytenr;
        u64 new_bytenr;
@@ -4609,7 +4622,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
        BUG_ON(ordered->file_offset != file_pos || ordered->len != len);
 
        disk_bytenr = file_pos + BTRFS_I(inode)->index_cnt;
-       ret = btrfs_lookup_csums_range(root->fs_info->csum_root, disk_bytenr,
+       ret = btrfs_lookup_csums_range(fs_info->csum_root, disk_bytenr,
                                       disk_bytenr + len - 1, &list, 0);
        if (ret)
                goto out;
@@ -4644,13 +4657,14 @@ int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,
                          struct btrfs_root *root, struct extent_buffer *buf,
                          struct extent_buffer *cow)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct reloc_control *rc;
        struct backref_node *node;
        int first_cow = 0;
        int level;
        int ret = 0;
 
-       rc = root->fs_info->reloc_ctl;
+       rc = fs_info->reloc_ctl;
        if (!rc)
                return 0;
 
index 60e711ae044a7ac5f0a06b0984c07e0676afd625..f7f6cb7d9a621c79ef0512094a0f048c209130cb 100644 (file)
@@ -132,6 +132,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
                      *root, struct btrfs_key *key, struct btrfs_root_item
                      *item)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct extent_buffer *l;
        int ret;
@@ -151,8 +152,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
 
        if (ret != 0) {
                btrfs_print_leaf(root, path->nodes[0]);
-               btrfs_crit(root->fs_info,
-                          "unable to update root key %llu %u %llu",
+               btrfs_crit(fs_info, "unable to update root key %llu %u %llu",
                           key->objectid, key->type, key->offset);
                BUG_ON(1);
        }
@@ -228,7 +228,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
        int ret;
        bool can_recover = true;
 
-       if (tree_root->fs_info->sb->s_flags & MS_RDONLY)
+       if (fs_info->sb->s_flags & MS_RDONLY)
                can_recover = false;
 
        path = btrfs_alloc_path();
@@ -276,8 +276,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
                 * in turn reads and inserts fs roots while doing backref
                 * walking.
                 */
-               root = btrfs_lookup_fs_root(tree_root->fs_info,
-                                           root_key.objectid);
+               root = btrfs_lookup_fs_root(fs_info, root_key.objectid);
                if (root) {
                        WARN_ON(!test_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED,
                                          &root->state));
@@ -298,7 +297,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
                        trans = btrfs_join_transaction(tree_root);
                        if (IS_ERR(trans)) {
                                err = PTR_ERR(trans);
-                               btrfs_handle_fs_error(tree_root->fs_info, err,
+                               btrfs_handle_fs_error(fs_info, err,
                                            "Failed to start trans to delete orphan item");
                                break;
                        }
@@ -306,7 +305,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
                                                    root_key.objectid);
                        btrfs_end_transaction(trans, tree_root);
                        if (err) {
-                               btrfs_handle_fs_error(tree_root->fs_info, err,
+                               btrfs_handle_fs_error(fs_info, err,
                                            "Failed to delete root orphan item");
                                break;
                        }
@@ -321,7 +320,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
 
                set_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED, &root->state);
 
-               err = btrfs_insert_fs_root(root->fs_info, root);
+               err = btrfs_insert_fs_root(fs_info, root);
                if (err) {
                        BUG_ON(err == -EEXIST);
                        btrfs_free_fs_root(root);
index 6834ff8dc0ab26c6341b9e468ae1d790132e8780..8aef00b0ff845bd34e12804383cf06f3fc7abc7a 100644 (file)
@@ -489,8 +489,8 @@ struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev, int is_dev_replace)
                        sctx->bios[i]->next_free = -1;
        }
        sctx->first_free = 0;
-       sctx->nodesize = dev->fs_info->nodesize;
-       sctx->sectorsize = dev->fs_info->sectorsize;
+       sctx->nodesize = fs_info->nodesize;
+       sctx->sectorsize = fs_info->sectorsize;
        atomic_set(&sctx->bios_in_flight, 0);
        atomic_set(&sctx->workers_pending, 0);
        atomic_set(&sctx->cancel_req, 0);
@@ -789,6 +789,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx)
 
 static void scrub_fixup_nodatasum(struct btrfs_work *work)
 {
+       struct btrfs_fs_info *fs_info;
        int ret;
        struct scrub_fixup_nodatasum *fixup;
        struct scrub_ctx *sctx;
@@ -798,6 +799,7 @@ static void scrub_fixup_nodatasum(struct btrfs_work *work)
 
        fixup = container_of(work, struct scrub_fixup_nodatasum, work);
        sctx = fixup->sctx;
+       fs_info = fixup->root->fs_info;
 
        path = btrfs_alloc_path();
        if (!path) {
@@ -823,9 +825,8 @@ static void scrub_fixup_nodatasum(struct btrfs_work *work)
         * (once it's finished) and rewrite the failed sector if a good copy
         * can be found.
         */
-       ret = iterate_inodes_from_logical(fixup->logical, fixup->root->fs_info,
-                                               path, scrub_fixup_readpage,
-                                               fixup);
+       ret = iterate_inodes_from_logical(fixup->logical, fs_info, path,
+                                         scrub_fixup_readpage, fixup);
        if (ret < 0) {
                uncorrectable = 1;
                goto out;
@@ -843,9 +844,9 @@ static void scrub_fixup_nodatasum(struct btrfs_work *work)
                spin_lock(&sctx->stat_lock);
                ++sctx->stat.uncorrectable_errors;
                spin_unlock(&sctx->stat_lock);
-               btrfs_dev_replace_stats_inc(&sctx->fs_info->dev_replace.
-                                               num_uncorrectable_read_errors);
-               btrfs_err_rl_in_rcu(sctx->fs_info,
+               btrfs_dev_replace_stats_inc(
+                       &fs_info->dev_replace.num_uncorrectable_read_errors);
+               btrfs_err_rl_in_rcu(fs_info,
                    "unable to fixup (nodatasum) error at logical %llu on dev %s",
                        fixup->logical, rcu_str_deref(fixup->dev->name));
        }
@@ -1176,8 +1177,7 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
                        if (scrub_write_page_to_dev_replace(sblock_other,
                                                            page_num) != 0) {
                                btrfs_dev_replace_stats_inc(
-                                       &sctx->fs_info->dev_replace.
-                                       num_write_errors);
+                                       &fs_info->dev_replace.num_write_errors);
                                success = 0;
                        }
                } else if (sblock_other) {
@@ -1563,6 +1563,7 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,
 {
        struct scrub_page *page_bad = sblock_bad->pagev[page_num];
        struct scrub_page *page_good = sblock_good->pagev[page_num];
+       struct btrfs_fs_info *fs_info = sblock_bad->sctx->fs_info;
 
        BUG_ON(page_bad->page == NULL);
        BUG_ON(page_good->page == NULL);
@@ -1572,7 +1573,7 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,
                int ret;
 
                if (!page_bad->dev->bdev) {
-                       btrfs_warn_rl(sblock_bad->sctx->fs_info,
+                       btrfs_warn_rl(fs_info,
                                "scrub_repair_page_from_good_copy(bdev == NULL) is unexpected");
                        return -EIO;
                }
@@ -1594,8 +1595,7 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,
                        btrfs_dev_stat_inc_and_print(page_bad->dev,
                                BTRFS_DEV_STAT_WRITE_ERRS);
                        btrfs_dev_replace_stats_inc(
-                               &sblock_bad->sctx->fs_info->
-                               dev_replace.num_write_errors);
+                               &fs_info->dev_replace.num_write_errors);
                        bio_put(bio);
                        return -EIO;
                }
@@ -1607,6 +1607,7 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,
 
 static void scrub_write_block_to_dev_replace(struct scrub_block *sblock)
 {
+       struct btrfs_fs_info *fs_info = sblock->sctx->fs_info;
        int page_num;
 
        /*
@@ -1622,8 +1623,7 @@ static void scrub_write_block_to_dev_replace(struct scrub_block *sblock)
                ret = scrub_write_page_to_dev_replace(sblock, page_num);
                if (ret)
                        btrfs_dev_replace_stats_inc(
-                               &sblock->sctx->fs_info->dev_replace.
-                               num_write_errors);
+                               &fs_info->dev_replace.num_write_errors);
        }
 }
 
@@ -1857,8 +1857,7 @@ static int scrub_checksum_tree_block(struct scrub_block *sblock)
 {
        struct scrub_ctx *sctx = sblock->sctx;
        struct btrfs_header *h;
-       struct btrfs_root *root = sctx->fs_info->dev_root;
-       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_fs_info *fs_info = sctx->fs_info;
        u8 calculated_csum[BTRFS_CSUM_SIZE];
        u8 on_disk_csum[BTRFS_CSUM_SIZE];
        struct page *page;
@@ -2138,6 +2137,7 @@ static void scrub_missing_raid56_worker(struct btrfs_work *work)
 {
        struct scrub_block *sblock = container_of(work, struct scrub_block, work);
        struct scrub_ctx *sctx = sblock->sctx;
+       struct btrfs_fs_info *fs_info = sctx->fs_info;
        u64 logical;
        struct btrfs_device *dev;
 
@@ -2151,14 +2151,14 @@ static void scrub_missing_raid56_worker(struct btrfs_work *work)
                spin_lock(&sctx->stat_lock);
                sctx->stat.read_errors++;
                spin_unlock(&sctx->stat_lock);
-               btrfs_err_rl_in_rcu(sctx->fs_info,
+               btrfs_err_rl_in_rcu(fs_info,
                        "IO error rebuilding logical %llu for dev %s",
                        logical, rcu_str_deref(dev->name));
        } else if (sblock->header_error || sblock->checksum_error) {
                spin_lock(&sctx->stat_lock);
                sctx->stat.uncorrectable_errors++;
                spin_unlock(&sctx->stat_lock);
-               btrfs_err_rl_in_rcu(sctx->fs_info,
+               btrfs_err_rl_in_rcu(fs_info,
                        "failed to rebuild valid logical %llu for dev %s",
                        logical, rcu_str_deref(dev->name));
        } else {
@@ -2749,6 +2749,7 @@ static void scrub_parity_bio_endio_worker(struct btrfs_work *work)
 static void scrub_parity_bio_endio(struct bio *bio)
 {
        struct scrub_parity *sparity = (struct scrub_parity *)bio->bi_private;
+       struct btrfs_fs_info *fs_info = sparity->sctx->fs_info;
 
        if (bio->bi_error)
                bitmap_or(sparity->ebitmap, sparity->ebitmap, sparity->dbitmap,
@@ -2758,14 +2759,14 @@ static void scrub_parity_bio_endio(struct bio *bio)
 
        btrfs_init_work(&sparity->work, btrfs_scrubparity_helper,
                        scrub_parity_bio_endio_worker, NULL, NULL);
-       btrfs_queue_work(sparity->sctx->fs_info->scrub_parity_workers,
-                        &sparity->work);
+       btrfs_queue_work(fs_info->scrub_parity_workers, &sparity->work);
 }
 
 static void scrub_parity_check_and_repair(struct scrub_parity *sparity)
 {
        struct scrub_ctx *sctx = sparity->sctx;
-       struct btrfs_root *dev_root = sctx->fs_info->dev_root;
+       struct btrfs_fs_info *fs_info = sctx->fs_info;
+       struct btrfs_root *dev_root = fs_info->dev_root;
        struct bio *bio;
        struct btrfs_raid_bio *rbio;
        struct scrub_page *spage;
@@ -2778,8 +2779,7 @@ static void scrub_parity_check_and_repair(struct scrub_parity *sparity)
                goto out;
 
        length = sparity->logic_end - sparity->logic_start;
-       ret = btrfs_map_sblock(sctx->fs_info, BTRFS_MAP_WRITE,
-                              sparity->logic_start,
+       ret = btrfs_map_sblock(fs_info, BTRFS_MAP_WRITE, sparity->logic_start,
                               &length, &bbio, 0, 1);
        if (ret || !bbio || !bbio->raid_map)
                goto bbio_out;
@@ -2866,7 +2866,7 @@ static noinline_for_stack int scrub_raid56_parity(struct scrub_ctx *sctx,
        int extent_mirror_num;
        int stop_loop = 0;
 
-       nsectors = div_u64(map->stripe_len, root->fs_info->sectorsize);
+       nsectors = div_u64(map->stripe_len, fs_info->sectorsize);
        bitmap_len = scrub_calc_parity_bitmap_len(nsectors);
        sparity = kzalloc(sizeof(struct scrub_parity) + 2 * bitmap_len,
                          GFP_NOFS);
@@ -2937,7 +2937,7 @@ static noinline_for_stack int scrub_raid56_parity(struct scrub_ctx *sctx,
                                goto next;
 
                        if (key.type == BTRFS_METADATA_ITEM_KEY)
-                               bytes = root->fs_info->nodesize;
+                               bytes = fs_info->nodesize;
                        else
                                bytes = key.offset;
 
@@ -3290,7 +3290,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
                                goto next;
 
                        if (key.type == BTRFS_METADATA_ITEM_KEY)
-                               bytes = root->fs_info->nodesize;
+                               bytes = fs_info->nodesize;
                        else
                                bytes = key.offset;
 
@@ -3497,8 +3497,8 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
 {
        struct btrfs_dev_extent *dev_extent = NULL;
        struct btrfs_path *path;
-       struct btrfs_root *root = sctx->fs_info->dev_root;
-       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_fs_info *fs_info = sctx->fs_info;
+       struct btrfs_root *root = fs_info->dev_root;
        u64 length;
        u64 chunk_offset;
        int ret = 0;
@@ -3747,16 +3747,16 @@ static noinline_for_stack int scrub_supers(struct scrub_ctx *sctx,
        u64     bytenr;
        u64     gen;
        int     ret;
-       struct btrfs_root *root = sctx->fs_info->dev_root;
+       struct btrfs_fs_info *fs_info = sctx->fs_info;
 
-       if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))
+       if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
                return -EIO;
 
        /* Seed devices of a new filesystem has their own generation. */
-       if (scrub_dev->fs_devices != root->fs_info->fs_devices)
+       if (scrub_dev->fs_devices != fs_info->fs_devices)
                gen = scrub_dev->generation;
        else
-               gen = root->fs_info->last_trans_committed;
+               gen = fs_info->last_trans_committed;
 
        for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
                bytenr = btrfs_sb_offset(i);
@@ -4052,16 +4052,17 @@ int btrfs_scrub_cancel_dev(struct btrfs_fs_info *fs_info,
 int btrfs_scrub_progress(struct btrfs_root *root, u64 devid,
                         struct btrfs_scrub_progress *progress)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_device *dev;
        struct scrub_ctx *sctx = NULL;
 
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
-       dev = btrfs_find_device(root->fs_info, devid, NULL, NULL);
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
+       dev = btrfs_find_device(fs_info, devid, NULL, NULL);
        if (dev)
                sctx = dev->scrub_device;
        if (sctx)
                memcpy(progress, &sctx->stat, sizeof(*progress));
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
        return dev ? (sctx ? 0 : -ENOTCONN) : -ENODEV;
 }
@@ -4171,20 +4172,17 @@ static void copy_nocow_pages_worker(struct btrfs_work *work)
        struct scrub_copy_nocow_ctx *nocow_ctx =
                container_of(work, struct scrub_copy_nocow_ctx, work);
        struct scrub_ctx *sctx = nocow_ctx->sctx;
+       struct btrfs_fs_info *fs_info = sctx->fs_info;
+       struct btrfs_root *root = fs_info->extent_root;
        u64 logical = nocow_ctx->logical;
        u64 len = nocow_ctx->len;
        int mirror_num = nocow_ctx->mirror_num;
        u64 physical_for_dev_replace = nocow_ctx->physical_for_dev_replace;
        int ret;
        struct btrfs_trans_handle *trans = NULL;
-       struct btrfs_fs_info *fs_info;
        struct btrfs_path *path;
-       struct btrfs_root *root;
        int not_written = 0;
 
-       fs_info = sctx->fs_info;
-       root = fs_info->extent_root;
-
        path = btrfs_alloc_path();
        if (!path) {
                spin_lock(&sctx->stat_lock);
index 78845cc81dd62b3d1f7be103a41772fcf6484fdb..399b36b2a182297f091e4d2c27a914dc025fb46d 100644 (file)
@@ -1431,9 +1431,9 @@ static int find_extent_clone(struct send_ctx *sctx,
                extent_item_pos = logical - found_key.objectid;
        else
                extent_item_pos = 0;
-       ret = iterate_extent_inodes(fs_info,
-                                       found_key.objectid, extent_item_pos, 1,
-                                       __iterate_backrefs, backref_ctx);
+       ret = iterate_extent_inodes(fs_info, found_key.objectid,
+                                   extent_item_pos, 1, __iterate_backrefs,
+                                   backref_ctx);
 
        if (ret < 0)
                goto out;
@@ -6137,17 +6137,17 @@ static void btrfs_root_dec_send_in_progress(struct btrfs_root* root)
         */
        if (root->send_in_progress < 0)
                btrfs_err(root->fs_info,
-                       "send_in_progres unbalanced %d root %llu",
-                       root->send_in_progress, root->root_key.objectid);
+                         "send_in_progres unbalanced %d root %llu",
+                         root->send_in_progress, root->root_key.objectid);
        spin_unlock(&root->root_item_lock);
 }
 
 long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
 {
        int ret = 0;
-       struct btrfs_root *send_root;
+       struct btrfs_root *send_root = BTRFS_I(file_inode(mnt_file))->root;
+       struct btrfs_fs_info *fs_info = send_root->fs_info;
        struct btrfs_root *clone_root;
-       struct btrfs_fs_info *fs_info;
        struct btrfs_ioctl_send_args *arg = NULL;
        struct btrfs_key key;
        struct send_ctx *sctx = NULL;
@@ -6161,9 +6161,6 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       send_root = BTRFS_I(file_inode(mnt_file))->root;
-       fs_info = send_root->fs_info;
-
        /*
         * The subvolume must remain read-only during send, protect against
         * making it RW. This also protects against deletion.
index c91a51f1e8f23ddff10dfd22eea1b510c70e5dad..fa2f33fe8c6cbb3a2a93b39a7e2a9ab2d0b1e9bf 100644 (file)
@@ -411,8 +411,8 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
        bool saved_compress_force;
        int no_compress = 0;
 
-       cache_gen = btrfs_super_cache_generation(root->fs_info->super_copy);
-       if (btrfs_fs_compat_ro(root->fs_info, FREE_SPACE_TREE))
+       cache_gen = btrfs_super_cache_generation(info->super_copy);
+       if (btrfs_fs_compat_ro(info, FREE_SPACE_TREE))
                btrfs_set_opt(info->mount_opt, FREE_SPACE_TREE);
        else if (cache_gen)
                btrfs_set_opt(info->mount_opt, SPACE_CACHE);
@@ -442,7 +442,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                token = match_token(p, tokens, args);
                switch (token) {
                case Opt_degraded:
-                       btrfs_info(root->fs_info, "allowing degraded mounts");
+                       btrfs_info(info, "allowing degraded mounts");
                        btrfs_set_opt(info->mount_opt, DEGRADED);
                        break;
                case Opt_subvol:
@@ -461,11 +461,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                case Opt_datasum:
                        if (btrfs_test_opt(info, NODATASUM)) {
                                if (btrfs_test_opt(info, NODATACOW))
-                                       btrfs_info(root->fs_info,
+                                       btrfs_info(info,
                                                   "setting datasum, datacow enabled");
                                else
-                                       btrfs_info(root->fs_info,
-                                                  "setting datasum");
+                                       btrfs_info(info, "setting datasum");
                        }
                        btrfs_clear_opt(info->mount_opt, NODATACOW);
                        btrfs_clear_opt(info->mount_opt, NODATASUM);
@@ -474,11 +473,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                        if (!btrfs_test_opt(info, NODATACOW)) {
                                if (!btrfs_test_opt(info, COMPRESS) ||
                                    !btrfs_test_opt(info, FORCE_COMPRESS)) {
-                                       btrfs_info(root->fs_info,
+                                       btrfs_info(info,
                                                   "setting nodatacow, compression disabled");
                                } else {
-                                       btrfs_info(root->fs_info,
-                                                  "setting nodatacow");
+                                       btrfs_info(info, "setting nodatacow");
                                }
                        }
                        btrfs_clear_opt(info->mount_opt, COMPRESS);
@@ -545,8 +543,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                              compress_force != saved_compress_force)) ||
                            (!btrfs_test_opt(info, COMPRESS) &&
                             no_compress == 1)) {
-                               btrfs_info(root->fs_info,
-                                          "%s %s compression",
+                               btrfs_info(info, "%s %s compression",
                                           (compress_force) ? "force" : "use",
                                           compress_type);
                        }
@@ -594,10 +591,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                                if (info->max_inline) {
                                        info->max_inline = min_t(u64,
                                                info->max_inline,
-                                               root->fs_info->sectorsize);
+                                               info->sectorsize);
                                }
-                               btrfs_info(root->fs_info, "max_inline at %llu",
-                                       info->max_inline);
+                               btrfs_info(info, "max_inline at %llu",
+                                          info->max_inline);
                        } else {
                                ret = -ENOMEM;
                                goto out;
@@ -610,8 +607,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                                info->alloc_start = memparse(num, NULL);
                                mutex_unlock(&info->chunk_mutex);
                                kfree(num);
-                               btrfs_info(root->fs_info,
-                                          "allocations start at %llu",
+                               btrfs_info(info, "allocations start at %llu",
                                           info->alloc_start);
                        } else {
                                ret = -ENOMEM;
@@ -620,16 +616,15 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                        break;
                case Opt_acl:
 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
-                       root->fs_info->sb->s_flags |= MS_POSIXACL;
+                       info->sb->s_flags |= MS_POSIXACL;
                        break;
 #else
-                       btrfs_err(root->fs_info,
-                               "support for ACL not compiled in!");
+                       btrfs_err(info, "support for ACL not compiled in!");
                        ret = -EINVAL;
                        goto out;
 #endif
                case Opt_noacl:
-                       root->fs_info->sb->s_flags &= ~MS_POSIXACL;
+                       info->sb->s_flags &= ~MS_POSIXACL;
                        break;
                case Opt_notreelog:
                        btrfs_set_and_info(info, NOTREELOG,
@@ -658,8 +653,8 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                                goto out;
                        } else if (intarg >= 0) {
                                info->metadata_ratio = intarg;
-                               btrfs_info(root->fs_info, "metadata ratio %d",
-                                      info->metadata_ratio);
+                               btrfs_info(info, "metadata ratio %d",
+                                          info->metadata_ratio);
                        } else {
                                ret = -EINVAL;
                                goto out;
@@ -677,15 +672,14 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                case Opt_space_cache_version:
                        if (token == Opt_space_cache ||
                            strcmp(args[0].from, "v1") == 0) {
-                               btrfs_clear_opt(root->fs_info->mount_opt,
+                               btrfs_clear_opt(info->mount_opt,
                                                FREE_SPACE_TREE);
                                btrfs_set_and_info(info, SPACE_CACHE,
-                                                  "enabling disk space caching");
+                                          "enabling disk space caching");
                        } else if (strcmp(args[0].from, "v2") == 0) {
-                               btrfs_clear_opt(root->fs_info->mount_opt,
+                               btrfs_clear_opt(info->mount_opt,
                                                SPACE_CACHE);
-                               btrfs_set_and_info(info,
-                                                  FREE_SPACE_TREE,
+                               btrfs_set_and_info(info, FREE_SPACE_TREE,
                                                   "enabling free space tree");
                        } else {
                                ret = -EINVAL;
@@ -697,14 +691,12 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                        break;
                case Opt_no_space_cache:
                        if (btrfs_test_opt(info, SPACE_CACHE)) {
-                               btrfs_clear_and_info(info,
-                                                    SPACE_CACHE,
-                                                    "disabling disk space caching");
+                               btrfs_clear_and_info(info, SPACE_CACHE,
+                                            "disabling disk space caching");
                        }
                        if (btrfs_test_opt(info, FREE_SPACE_TREE)) {
-                               btrfs_clear_and_info(info,
-                                                    FREE_SPACE_TREE,
-                                                    "disabling free space tree");
+                               btrfs_clear_and_info(info, FREE_SPACE_TREE,
+                                            "disabling free space tree");
                        }
                        break;
                case Opt_inode_cache:
@@ -737,10 +729,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                                             "disabling auto defrag");
                        break;
                case Opt_recovery:
-                       btrfs_warn(root->fs_info,
+                       btrfs_warn(info,
                                   "'recovery' is deprecated, use 'usebackuproot' instead");
                case Opt_usebackuproot:
-                       btrfs_info(root->fs_info,
+                       btrfs_info(info,
                                   "trying to use backup root at mount time");
                        btrfs_set_opt(info->mount_opt, USEBACKUPROOT);
                        break;
@@ -749,14 +741,14 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                        break;
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
                case Opt_check_integrity_including_extent_data:
-                       btrfs_info(root->fs_info,
+                       btrfs_info(info,
                                   "enabling check integrity including extent data");
                        btrfs_set_opt(info->mount_opt,
                                      CHECK_INTEGRITY_INCLUDING_EXTENT_DATA);
                        btrfs_set_opt(info->mount_opt, CHECK_INTEGRITY);
                        break;
                case Opt_check_integrity:
-                       btrfs_info(root->fs_info, "enabling check integrity");
+                       btrfs_info(info, "enabling check integrity");
                        btrfs_set_opt(info->mount_opt, CHECK_INTEGRITY);
                        break;
                case Opt_check_integrity_print_mask:
@@ -765,7 +757,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                                goto out;
                        } else if (intarg >= 0) {
                                info->check_integrity_print_mask = intarg;
-                               btrfs_info(root->fs_info,
+                               btrfs_info(info,
                                           "check_integrity_print_mask 0x%x",
                                           info->check_integrity_print_mask);
                        } else {
@@ -777,8 +769,8 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                case Opt_check_integrity_including_extent_data:
                case Opt_check_integrity:
                case Opt_check_integrity_print_mask:
-                       btrfs_err(root->fs_info,
-                               "support for check_integrity* not compiled in!");
+                       btrfs_err(info,
+                                 "support for check_integrity* not compiled in!");
                        ret = -EINVAL;
                        goto out;
 #endif
@@ -798,20 +790,19 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                        intarg = 0;
                        ret = match_int(&args[0], &intarg);
                        if (ret < 0) {
-                               btrfs_err(root->fs_info,
-                                         "invalid commit interval");
+                               btrfs_err(info, "invalid commit interval");
                                ret = -EINVAL;
                                goto out;
                        }
                        if (intarg > 0) {
                                if (intarg > 300) {
-                                       btrfs_warn(root->fs_info,
+                                       btrfs_warn(info,
                                                "excessive commit interval %d",
                                                intarg);
                                }
                                info->commit_interval = intarg;
                        } else {
-                               btrfs_info(root->fs_info,
+                               btrfs_info(info,
                                           "using default commit interval %ds",
                                           BTRFS_DEFAULT_COMMIT_INTERVAL);
                                info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL;
@@ -819,23 +810,22 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                        break;
 #ifdef CONFIG_BTRFS_DEBUG
                case Opt_fragment_all:
-                       btrfs_info(root->fs_info, "fragmenting all space");
+                       btrfs_info(info, "fragmenting all space");
                        btrfs_set_opt(info->mount_opt, FRAGMENT_DATA);
                        btrfs_set_opt(info->mount_opt, FRAGMENT_METADATA);
                        break;
                case Opt_fragment_metadata:
-                       btrfs_info(root->fs_info, "fragmenting metadata");
+                       btrfs_info(info, "fragmenting metadata");
                        btrfs_set_opt(info->mount_opt,
                                      FRAGMENT_METADATA);
                        break;
                case Opt_fragment_data:
-                       btrfs_info(root->fs_info, "fragmenting data");
+                       btrfs_info(info, "fragmenting data");
                        btrfs_set_opt(info->mount_opt, FRAGMENT_DATA);
                        break;
 #endif
                case Opt_err:
-                       btrfs_info(root->fs_info,
-                                  "unrecognized mount option '%s'", p);
+                       btrfs_info(info, "unrecognized mount option '%s'", p);
                        ret = -EINVAL;
                        goto out;
                default:
@@ -847,22 +837,22 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
         * Extra check for current option against current flag
         */
        if (btrfs_test_opt(info, NOLOGREPLAY) && !(new_flags & MS_RDONLY)) {
-               btrfs_err(root->fs_info,
+               btrfs_err(info,
                          "nologreplay must be used with ro mount option");
                ret = -EINVAL;
        }
 out:
-       if (btrfs_fs_compat_ro(root->fs_info, FREE_SPACE_TREE) &&
+       if (btrfs_fs_compat_ro(info, FREE_SPACE_TREE) &&
            !btrfs_test_opt(info, FREE_SPACE_TREE) &&
            !btrfs_test_opt(info, CLEAR_CACHE)) {
-               btrfs_err(root->fs_info, "cannot disable free space tree");
+               btrfs_err(info, "cannot disable free space tree");
                ret = -EINVAL;
 
        }
        if (!ret && btrfs_test_opt(info, SPACE_CACHE))
-               btrfs_info(root->fs_info, "disk space caching is enabled");
+               btrfs_info(info, "disk space caching is enabled");
        if (!ret && btrfs_test_opt(info, FREE_SPACE_TREE))
-               btrfs_info(root->fs_info, "using free space tree");
+               btrfs_info(info, "using free space tree");
        kfree(orig);
        return ret;
 }
@@ -1223,7 +1213,6 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
 static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
 {
        struct btrfs_fs_info *info = btrfs_sb(dentry->d_sb);
-       struct btrfs_root *root = info->tree_root;
        char *compress_type;
 
        if (btrfs_test_opt(info, DEGRADED))
@@ -1265,7 +1254,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
                seq_puts(seq, ",flushoncommit");
        if (btrfs_test_opt(info, DISCARD))
                seq_puts(seq, ",discard");
-       if (!(root->fs_info->sb->s_flags & MS_POSIXACL))
+       if (!(info->sb->s_flags & MS_POSIXACL))
                seq_puts(seq, ",noacl");
        if (btrfs_test_opt(info, SPACE_CACHE))
                seq_puts(seq, ",space_cache");
@@ -1788,7 +1777,7 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
                if (ret)
                        goto restore;
        } else {
-               if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state)) {
+               if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) {
                        btrfs_err(fs_info,
                                "Remounting read-write after error is not allowed");
                        ret = -EINVAL;
@@ -2246,9 +2235,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 static int btrfs_freeze(struct super_block *sb)
 {
        struct btrfs_trans_handle *trans;
-       struct btrfs_root *root = btrfs_sb(sb)->tree_root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(sb);
+       struct btrfs_root *root = fs_info->tree_root;
 
-       root->fs_info->fs_frozen = 1;
+       fs_info->fs_frozen = 1;
        /*
         * We don't need a barrier here, we'll wait for any transaction that
         * could be in progress on other threads (and do delayed iputs that
@@ -2267,9 +2257,7 @@ static int btrfs_freeze(struct super_block *sb)
 
 static int btrfs_unfreeze(struct super_block *sb)
 {
-       struct btrfs_root *root = btrfs_sb(sb)->tree_root;
-
-       root->fs_info->fs_frozen = 0;
+       btrfs_sb(sb)->fs_frozen = 0;
        return 0;
 }
 
index bec5aa0e94e282c8d4d58ddd3ce9fbed7359d593..7fa8a6a9d07e5cc57751dd05a062d0c66480ef23 100644 (file)
@@ -314,9 +314,11 @@ static int record_root_in_trans(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root,
                               int force)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        if ((test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
            root->last_trans < trans->transid) || force) {
-               WARN_ON(root == root->fs_info->extent_root);
+               WARN_ON(root == fs_info->extent_root);
                WARN_ON(root->commit_root != root->node);
 
                /*
@@ -331,15 +333,15 @@ static int record_root_in_trans(struct btrfs_trans_handle *trans,
                 */
                smp_wmb();
 
-               spin_lock(&root->fs_info->fs_roots_radix_lock);
+               spin_lock(&fs_info->fs_roots_radix_lock);
                if (root->last_trans == trans->transid && !force) {
-                       spin_unlock(&root->fs_info->fs_roots_radix_lock);
+                       spin_unlock(&fs_info->fs_roots_radix_lock);
                        return 0;
                }
-               radix_tree_tag_set(&root->fs_info->fs_roots_radix,
-                          (unsigned long)root->root_key.objectid,
-                          BTRFS_ROOT_TRANS_TAG);
-               spin_unlock(&root->fs_info->fs_roots_radix_lock);
+               radix_tree_tag_set(&fs_info->fs_roots_radix,
+                                  (unsigned long)root->root_key.objectid,
+                                  BTRFS_ROOT_TRANS_TAG);
+               spin_unlock(&fs_info->fs_roots_radix_lock);
                root->last_trans = trans->transid;
 
                /* this is pretty tricky.  We don't want to
@@ -372,6 +374,7 @@ static int record_root_in_trans(struct btrfs_trans_handle *trans,
 void btrfs_add_dropped_root(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_transaction *cur_trans = trans->transaction;
 
        /* Add ourselves to the transaction dropped list */
@@ -380,16 +383,18 @@ void btrfs_add_dropped_root(struct btrfs_trans_handle *trans,
        spin_unlock(&cur_trans->dropped_roots_lock);
 
        /* Make sure we don't try to update the root at commit time */
-       spin_lock(&root->fs_info->fs_roots_radix_lock);
-       radix_tree_tag_clear(&root->fs_info->fs_roots_radix,
+       spin_lock(&fs_info->fs_roots_radix_lock);
+       radix_tree_tag_clear(&fs_info->fs_roots_radix,
                             (unsigned long)root->root_key.objectid,
                             BTRFS_ROOT_TRANS_TAG);
-       spin_unlock(&root->fs_info->fs_roots_radix_lock);
+       spin_unlock(&fs_info->fs_roots_radix_lock);
 }
 
 int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        if (!test_bit(BTRFS_ROOT_REF_COWS, &root->state))
                return 0;
 
@@ -402,9 +407,9 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,
            !test_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state))
                return 0;
 
-       mutex_lock(&root->fs_info->reloc_mutex);
+       mutex_lock(&fs_info->reloc_mutex);
        record_root_in_trans(trans, root, 0);
-       mutex_unlock(&root->fs_info->reloc_mutex);
+       mutex_unlock(&fs_info->reloc_mutex);
 
        return 0;
 }
@@ -422,33 +427,36 @@ static inline int is_transaction_blocked(struct btrfs_transaction *trans)
  */
 static void wait_current_trans(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_transaction *cur_trans;
 
-       spin_lock(&root->fs_info->trans_lock);
-       cur_trans = root->fs_info->running_transaction;
+       spin_lock(&fs_info->trans_lock);
+       cur_trans = fs_info->running_transaction;
        if (cur_trans && is_transaction_blocked(cur_trans)) {
                atomic_inc(&cur_trans->use_count);
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
 
-               wait_event(root->fs_info->transaction_wait,
+               wait_event(fs_info->transaction_wait,
                           cur_trans->state >= TRANS_STATE_UNBLOCKED ||
                           cur_trans->aborted);
                btrfs_put_transaction(cur_trans);
        } else {
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
        }
 }
 
 static int may_wait_transaction(struct btrfs_root *root, int type)
 {
-       if (test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags))
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags))
                return 0;
 
        if (type == TRANS_USERSPACE)
                return 1;
 
        if (type == TRANS_START &&
-           !atomic_read(&root->fs_info->open_ioctl_trans))
+           !atomic_read(&fs_info->open_ioctl_trans))
                return 1;
 
        return 0;
@@ -456,7 +464,9 @@ static int may_wait_transaction(struct btrfs_root *root, int type)
 
 static inline bool need_reserve_reloc_root(struct btrfs_root *root)
 {
-       if (!root->fs_info->reloc_ctl ||
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       if (!fs_info->reloc_ctl ||
            !test_bit(BTRFS_ROOT_REF_COWS, &root->state) ||
            root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID ||
            root->reloc_root)
@@ -469,6 +479,8 @@ static struct btrfs_trans_handle *
 start_transaction(struct btrfs_root *root, unsigned int num_items,
                  unsigned int type, enum btrfs_reserve_flush_enum flush)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        struct btrfs_trans_handle *h;
        struct btrfs_transaction *cur_trans;
        u64 num_bytes = 0;
@@ -479,7 +491,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
        /* Send isn't supposed to start transactions. */
        ASSERT(current->journal_info != BTRFS_SEND_TRANS_STUB);
 
-       if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))
+       if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
                return ERR_PTR(-EROFS);
 
        if (current->journal_info) {
@@ -496,24 +508,22 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
         * Do the reservation before we join the transaction so we can do all
         * the appropriate flushing if need be.
         */
-       if (num_items > 0 && root != root->fs_info->chunk_root) {
-               qgroup_reserved = num_items * root->fs_info->nodesize;
+       if (num_items > 0 && root != fs_info->chunk_root) {
+               qgroup_reserved = num_items * fs_info->nodesize;
                ret = btrfs_qgroup_reserve_meta(root, qgroup_reserved);
                if (ret)
                        return ERR_PTR(ret);
 
-               num_bytes = btrfs_calc_trans_metadata_size(root->fs_info,
-                                                          num_items);
+               num_bytes = btrfs_calc_trans_metadata_size(fs_info, num_items);
                /*
                 * Do the reservation for the relocation root creation
                 */
                if (need_reserve_reloc_root(root)) {
-                       num_bytes += root->fs_info->nodesize;
+                       num_bytes += fs_info->nodesize;
                        reloc_reserved = true;
                }
 
-               ret = btrfs_block_rsv_add(root,
-                                         &root->fs_info->trans_block_rsv,
+               ret = btrfs_block_rsv_add(root, &fs_info->trans_block_rsv,
                                          num_bytes, flush);
                if (ret)
                        goto reserve_fail;
@@ -536,7 +546,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
         * transaction and commit it, so we needn't do sb_start_intwrite(). 
         */
        if (type & __TRANS_FREEZABLE)
-               sb_start_intwrite(root->fs_info->sb);
+               sb_start_intwrite(fs_info->sb);
 
        if (may_wait_transaction(root, type))
                wait_current_trans(root);
@@ -553,7 +563,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
        if (ret < 0)
                goto join_fail;
 
-       cur_trans = root->fs_info->running_transaction;
+       cur_trans = fs_info->running_transaction;
 
        h->transid = cur_trans->transid;
        h->transaction = cur_trans;
@@ -575,9 +585,9 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
        }
 
        if (num_bytes) {
-               trace_btrfs_space_reservation(root->fs_info, "transaction",
+               trace_btrfs_space_reservation(fs_info, "transaction",
                                              h->transid, num_bytes, 1);
-               h->block_rsv = &root->fs_info->trans_block_rsv;
+               h->block_rsv = &fs_info->trans_block_rsv;
                h->bytes_reserved = num_bytes;
                h->reloc_reserved = reloc_reserved;
        }
@@ -591,11 +601,11 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
 
 join_fail:
        if (type & __TRANS_FREEZABLE)
-               sb_end_intwrite(root->fs_info->sb);
+               sb_end_intwrite(fs_info->sb);
        kmem_cache_free(btrfs_trans_handle_cachep, h);
 alloc_fail:
        if (num_bytes)
-               btrfs_block_rsv_release(root, &root->fs_info->trans_block_rsv,
+               btrfs_block_rsv_release(root, &fs_info->trans_block_rsv,
                                        num_bytes);
 reserve_fail:
        btrfs_qgroup_free_meta(root, qgroup_reserved);
@@ -613,6 +623,7 @@ struct btrfs_trans_handle *btrfs_start_transaction_fallback_global_rsv(
                                        unsigned int num_items,
                                        int min_factor)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_trans_handle *trans;
        u64 num_bytes;
        int ret;
@@ -625,19 +636,17 @@ struct btrfs_trans_handle *btrfs_start_transaction_fallback_global_rsv(
        if (IS_ERR(trans))
                return trans;
 
-       num_bytes = btrfs_calc_trans_metadata_size(root->fs_info, num_items);
-       ret = btrfs_cond_migrate_bytes(root->fs_info,
-                                      &root->fs_info->trans_block_rsv,
-                                      num_bytes,
-                                      min_factor);
+       num_bytes = btrfs_calc_trans_metadata_size(fs_info, num_items);
+       ret = btrfs_cond_migrate_bytes(fs_info, &fs_info->trans_block_rsv,
+                                      num_bytes, min_factor);
        if (ret) {
                btrfs_end_transaction(trans, root);
                return ERR_PTR(ret);
        }
 
-       trans->block_rsv = &root->fs_info->trans_block_rsv;
+       trans->block_rsv = &fs_info->trans_block_rsv;
        trans->bytes_reserved = num_bytes;
-       trace_btrfs_space_reservation(root->fs_info, "transaction",
+       trace_btrfs_space_reservation(fs_info, "transaction",
                                      trans->transid, num_bytes, 1);
 
        return trans;
@@ -717,16 +726,17 @@ static noinline void wait_for_commit(struct btrfs_root *root,
 
 int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_transaction *cur_trans = NULL, *t;
        int ret = 0;
 
        if (transid) {
-               if (transid <= root->fs_info->last_trans_committed)
+               if (transid <= fs_info->last_trans_committed)
                        goto out;
 
                /* find specified transaction */
-               spin_lock(&root->fs_info->trans_lock);
-               list_for_each_entry(t, &root->fs_info->trans_list, list) {
+               spin_lock(&fs_info->trans_lock);
+               list_for_each_entry(t, &fs_info->trans_list, list) {
                        if (t->transid == transid) {
                                cur_trans = t;
                                atomic_inc(&cur_trans->use_count);
@@ -738,21 +748,21 @@ int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid)
                                break;
                        }
                }
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
 
                /*
                 * The specified transaction doesn't exist, or we
                 * raced with btrfs_commit_transaction
                 */
                if (!cur_trans) {
-                       if (transid > root->fs_info->last_trans_committed)
+                       if (transid > fs_info->last_trans_committed)
                                ret = -EINVAL;
                        goto out;
                }
        } else {
                /* find newest transaction that is committing | committed */
-               spin_lock(&root->fs_info->trans_lock);
-               list_for_each_entry_reverse(t, &root->fs_info->trans_list,
+               spin_lock(&fs_info->trans_lock);
+               list_for_each_entry_reverse(t, &fs_info->trans_list,
                                            list) {
                        if (t->state >= TRANS_STATE_COMMIT_START) {
                                if (t->state == TRANS_STATE_COMPLETED)
@@ -762,7 +772,7 @@ int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid)
                                break;
                        }
                }
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
                if (!cur_trans)
                        goto out;  /* nothing committing|committed */
        }
@@ -775,18 +785,22 @@ int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid)
 
 void btrfs_throttle(struct btrfs_root *root)
 {
-       if (!atomic_read(&root->fs_info->open_ioctl_trans))
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       if (!atomic_read(&fs_info->open_ioctl_trans))
                wait_current_trans(root);
 }
 
 static int should_end_transaction(struct btrfs_trans_handle *trans,
                                  struct btrfs_root *root)
 {
-       if (root->fs_info->global_block_rsv.space_info->full &&
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       if (fs_info->global_block_rsv.space_info->full &&
            btrfs_check_space_for_delayed_refs(trans, root))
                return 1;
 
-       return !!btrfs_block_rsv_check(root, &root->fs_info->global_block_rsv, 5);
+       return !!btrfs_block_rsv_check(root, &fs_info->global_block_rsv, 5);
 }
 
 int btrfs_should_end_transaction(struct btrfs_trans_handle *trans,
@@ -858,7 +872,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
 
        btrfs_trans_release_chunk_metadata(trans);
 
-       if (lock && !atomic_read(&root->fs_info->open_ioctl_trans) &&
+       if (lock && !atomic_read(&info->open_ioctl_trans) &&
            should_end_transaction(trans, root) &&
            ACCESS_ONCE(cur_trans->state) == TRANS_STATE_RUNNING) {
                spin_lock(&info->trans_lock);
@@ -875,7 +889,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
        }
 
        if (trans->type & __TRANS_FREEZABLE)
-               sb_end_intwrite(root->fs_info->sb);
+               sb_end_intwrite(info->sb);
 
        WARN_ON(cur_trans != info->running_transaction);
        WARN_ON(atomic_read(&cur_trans->num_writers) < 1);
@@ -897,7 +911,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
                btrfs_run_delayed_iputs(root);
 
        if (trans->aborted ||
-           test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state)) {
+           test_bit(BTRFS_FS_STATE_ERROR, &info->fs_state)) {
                wake_up_process(info->transaction_kthread);
                err = -EIO;
        }
@@ -933,7 +947,8 @@ int btrfs_write_marked_extents(struct btrfs_root *root,
 {
        int err = 0;
        int werr = 0;
-       struct address_space *mapping = root->fs_info->btree_inode->i_mapping;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct address_space *mapping = fs_info->btree_inode->i_mapping;
        struct extent_state *cached_state = NULL;
        u64 start = 0;
        u64 end;
@@ -987,7 +1002,8 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,
 {
        int err = 0;
        int werr = 0;
-       struct address_space *mapping = root->fs_info->btree_inode->i_mapping;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct address_space *mapping = fs_info->btree_inode->i_mapping;
        struct extent_state *cached_state = NULL;
        u64 start = 0;
        u64 end;
@@ -1022,17 +1038,14 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,
 
        if (root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID) {
                if ((mark & EXTENT_DIRTY) &&
-                   test_and_clear_bit(BTRFS_FS_LOG1_ERR,
-                                      &root->fs_info->flags))
+                   test_and_clear_bit(BTRFS_FS_LOG1_ERR, &fs_info->flags))
                        errors = true;
 
                if ((mark & EXTENT_NEW) &&
-                   test_and_clear_bit(BTRFS_FS_LOG2_ERR,
-                                      &root->fs_info->flags))
+                   test_and_clear_bit(BTRFS_FS_LOG2_ERR, &fs_info->flags))
                        errors = true;
        } else {
-               if (test_and_clear_bit(BTRFS_FS_BTREE_ERR,
-                                      &root->fs_info->flags))
+               if (test_and_clear_bit(BTRFS_FS_BTREE_ERR, &fs_info->flags))
                        errors = true;
        }
 
@@ -1095,7 +1108,8 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans,
        int ret;
        u64 old_root_bytenr;
        u64 old_root_used;
-       struct btrfs_root *tree_root = root->fs_info->tree_root;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_root *tree_root = fs_info->tree_root;
 
        old_root_used = btrfs_root_used(&root->root_item);
 
@@ -1148,13 +1162,13 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,
        if (ret)
                return ret;
 
-       ret = btrfs_run_dev_stats(trans, root->fs_info);
+       ret = btrfs_run_dev_stats(trans, fs_info);
        if (ret)
                return ret;
-       ret = btrfs_run_dev_replace(trans, root->fs_info);
+       ret = btrfs_run_dev_replace(trans, fs_info);
        if (ret)
                return ret;
-       ret = btrfs_run_qgroups(trans, root->fs_info);
+       ret = btrfs_run_qgroups(trans, fs_info);
        if (ret)
                return ret;
 
@@ -1210,10 +1224,12 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,
  */
 void btrfs_add_dead_root(struct btrfs_root *root)
 {
-       spin_lock(&root->fs_info->trans_lock);
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
+       spin_lock(&fs_info->trans_lock);
        if (list_empty(&root->root_list))
-               list_add_tail(&root->root_list, &root->fs_info->dead_roots);
-       spin_unlock(&root->fs_info->trans_lock);
+               list_add_tail(&root->root_list, &fs_info->dead_roots);
+       spin_unlock(&fs_info->trans_lock);
 }
 
 /*
@@ -1462,7 +1478,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
        rsv = trans->block_rsv;
        trans->block_rsv = &pending->block_rsv;
        trans->bytes_reserved = trans->block_rsv->reserved;
-       trace_btrfs_space_reservation(root->fs_info, "transaction",
+       trace_btrfs_space_reservation(fs_info, "transaction",
                                      trans->transid,
                                      trans->bytes_reserved, 1);
        dentry = pending->dentry;
@@ -1582,7 +1598,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
        }
 
        key.offset = (u64)-1;
-       pending->snap = btrfs_read_fs_root_no_name(root->fs_info, &key);
+       pending->snap = btrfs_read_fs_root_no_name(fs_info, &key);
        if (IS_ERR(pending->snap)) {
                ret = PTR_ERR(pending->snap);
                btrfs_abort_transaction(trans, ret);
@@ -1692,23 +1708,24 @@ static noinline int create_pending_snapshots(struct btrfs_trans_handle *trans,
 
 static void update_super_roots(struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root_item *root_item;
        struct btrfs_super_block *super;
 
-       super = root->fs_info->super_copy;
+       super = fs_info->super_copy;
 
-       root_item = &root->fs_info->chunk_root->root_item;
+       root_item = &fs_info->chunk_root->root_item;
        super->chunk_root = root_item->bytenr;
        super->chunk_root_generation = root_item->generation;
        super->chunk_root_level = root_item->level;
 
-       root_item = &root->fs_info->tree_root->root_item;
+       root_item = &fs_info->tree_root->root_item;
        super->root = root_item->bytenr;
        super->generation = root_item->generation;
        super->root_level = root_item->level;
-       if (btrfs_test_opt(root->fs_info, SPACE_CACHE))
+       if (btrfs_test_opt(fs_info, SPACE_CACHE))
                super->cache_generation = root_item->generation;
-       if (test_bit(BTRFS_FS_UPDATE_UUID_TREE_GEN, &root->fs_info->flags))
+       if (test_bit(BTRFS_FS_UPDATE_UUID_TREE_GEN, &fs_info->flags))
                super->uuid_tree_generation = root_item->generation;
 }
 
@@ -1794,6 +1811,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans,
                                   struct btrfs_root *root,
                                   int wait_for_unblock)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_async_commit *ac;
        struct btrfs_transaction *cur_trans;
 
@@ -1821,7 +1839,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans,
         * async commit thread will be the one to unlock it.
         */
        if (ac->newtrans->type & __TRANS_FREEZABLE)
-               __sb_writers_release(root->fs_info->sb, SB_FREEZE_FS);
+               __sb_writers_release(fs_info->sb, SB_FREEZE_FS);
 
        schedule_work(&ac->work);
 
@@ -1842,6 +1860,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans,
 static void cleanup_transaction(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root, int err)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_transaction *cur_trans = trans->transaction;
        DEFINE_WAIT(wait);
 
@@ -1849,7 +1868,7 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans,
 
        btrfs_abort_transaction(trans, err);
 
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
 
        /*
         * If the transaction is removed from the list, it means this
@@ -1859,25 +1878,25 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans,
        BUG_ON(list_empty(&cur_trans->list));
 
        list_del_init(&cur_trans->list);
-       if (cur_trans == root->fs_info->running_transaction) {
+       if (cur_trans == fs_info->running_transaction) {
                cur_trans->state = TRANS_STATE_COMMIT_DOING;
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
                wait_event(cur_trans->writer_wait,
                           atomic_read(&cur_trans->num_writers) == 1);
 
-               spin_lock(&root->fs_info->trans_lock);
+               spin_lock(&fs_info->trans_lock);
        }
-       spin_unlock(&root->fs_info->trans_lock);
+       spin_unlock(&fs_info->trans_lock);
 
        btrfs_cleanup_one_transaction(trans->transaction, root);
 
-       spin_lock(&root->fs_info->trans_lock);
-       if (cur_trans == root->fs_info->running_transaction)
-               root->fs_info->running_transaction = NULL;
-       spin_unlock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
+       if (cur_trans == fs_info->running_transaction)
+               fs_info->running_transaction = NULL;
+       spin_unlock(&fs_info->trans_lock);
 
        if (trans->type & __TRANS_FREEZABLE)
-               sb_end_intwrite(root->fs_info->sb);
+               sb_end_intwrite(fs_info->sb);
        btrfs_put_transaction(cur_trans);
        btrfs_put_transaction(cur_trans);
 
@@ -1885,7 +1904,7 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans,
 
        if (current->journal_info == trans)
                current->journal_info = NULL;
-       btrfs_scrub_cancel(root->fs_info);
+       btrfs_scrub_cancel(fs_info);
 
        kmem_cache_free(btrfs_trans_handle_cachep, trans);
 }
@@ -1913,6 +1932,7 @@ btrfs_wait_pending_ordered(struct btrfs_transaction *cur_trans)
 int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_transaction *cur_trans = trans->transaction;
        struct btrfs_transaction *prev_trans = NULL;
        int ret;
@@ -1970,11 +1990,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                 * hurt to have more than one go through, but there's no
                 * real advantage to it either.
                 */
-               mutex_lock(&root->fs_info->ro_block_group_mutex);
+               mutex_lock(&fs_info->ro_block_group_mutex);
                if (!test_and_set_bit(BTRFS_TRANS_DIRTY_BG_RUN,
                                      &cur_trans->flags))
                        run_it = 1;
-               mutex_unlock(&root->fs_info->ro_block_group_mutex);
+               mutex_unlock(&fs_info->ro_block_group_mutex);
 
                if (run_it)
                        ret = btrfs_start_dirty_block_groups(trans, root);
@@ -1984,9 +2004,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                return ret;
        }
 
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
        if (cur_trans->state >= TRANS_STATE_COMMIT_START) {
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
                atomic_inc(&cur_trans->use_count);
                ret = btrfs_end_transaction(trans, root);
 
@@ -2001,14 +2021,14 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
        }
 
        cur_trans->state = TRANS_STATE_COMMIT_START;
-       wake_up(&root->fs_info->transaction_blocked_wait);
+       wake_up(&fs_info->transaction_blocked_wait);
 
-       if (cur_trans->list.prev != &root->fs_info->trans_list) {
+       if (cur_trans->list.prev != &fs_info->trans_list) {
                prev_trans = list_entry(cur_trans->list.prev,
                                        struct btrfs_transaction, list);
                if (prev_trans->state != TRANS_STATE_COMPLETED) {
                        atomic_inc(&prev_trans->use_count);
-                       spin_unlock(&root->fs_info->trans_lock);
+                       spin_unlock(&fs_info->trans_lock);
 
                        wait_for_commit(root, prev_trans);
                        ret = prev_trans->aborted;
@@ -2017,15 +2037,15 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                        if (ret)
                                goto cleanup_transaction;
                } else {
-                       spin_unlock(&root->fs_info->trans_lock);
+                       spin_unlock(&fs_info->trans_lock);
                }
        } else {
-               spin_unlock(&root->fs_info->trans_lock);
+               spin_unlock(&fs_info->trans_lock);
        }
 
        extwriter_counter_dec(cur_trans, trans->type);
 
-       ret = btrfs_start_delalloc_flush(root->fs_info);
+       ret = btrfs_start_delalloc_flush(fs_info);
        if (ret)
                goto cleanup_transaction;
 
@@ -2041,7 +2061,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
        if (ret)
                goto cleanup_transaction;
 
-       btrfs_wait_delalloc_flush(root->fs_info);
+       btrfs_wait_delalloc_flush(fs_info);
 
        btrfs_wait_pending_ordered(cur_trans);
 
@@ -2051,9 +2071,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         * commit the transaction.  We could have started a join before setting
         * COMMIT_DOING so make sure to wait for num_writers to == 1 again.
         */
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
        cur_trans->state = TRANS_STATE_COMMIT_DOING;
-       spin_unlock(&root->fs_info->trans_lock);
+       spin_unlock(&fs_info->trans_lock);
        wait_event(cur_trans->writer_wait,
                   atomic_read(&cur_trans->num_writers) == 1);
 
@@ -2067,16 +2087,16 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         * the balancing code from coming in and moving
         * extents around in the middle of the commit
         */
-       mutex_lock(&root->fs_info->reloc_mutex);
+       mutex_lock(&fs_info->reloc_mutex);
 
        /*
         * We needn't worry about the delayed items because we will
         * deal with them in create_pending_snapshot(), which is the
         * core function of the snapshot creation.
         */
-       ret = create_pending_snapshots(trans, root->fs_info);
+       ret = create_pending_snapshots(trans, fs_info);
        if (ret) {
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
@@ -2092,20 +2112,20 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         */
        ret = btrfs_run_delayed_items(trans, root);
        if (ret) {
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
        ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
        if (ret) {
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
        /* Reocrd old roots for later qgroup accounting */
-       ret = btrfs_qgroup_prepare_account_extents(trans, root->fs_info);
+       ret = btrfs_qgroup_prepare_account_extents(trans, fs_info);
        if (ret) {
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
@@ -2130,12 +2150,12 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         * from now until after the super is written, we avoid races
         * with the tree-log code.
         */
-       mutex_lock(&root->fs_info->tree_log_mutex);
+       mutex_lock(&fs_info->tree_log_mutex);
 
-       ret = commit_fs_roots(trans, root->fs_info);
+       ret = commit_fs_roots(trans, fs_info);
        if (ret) {
-               mutex_unlock(&root->fs_info->tree_log_mutex);
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->tree_log_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
@@ -2143,28 +2163,28 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         * Since the transaction is done, we can apply the pending changes
         * before the next transaction.
         */
-       btrfs_apply_pending_changes(root->fs_info);
+       btrfs_apply_pending_changes(fs_info);
 
        /* commit_fs_roots gets rid of all the tree log roots, it is now
         * safe to free the root of tree log roots
         */
-       btrfs_free_log_root_tree(trans, root->fs_info);
+       btrfs_free_log_root_tree(trans, fs_info);
 
        /*
         * Since fs roots are all committed, we can get a quite accurate
         * new_roots. So let's do quota accounting.
         */
-       ret = btrfs_qgroup_account_extents(trans, root->fs_info);
+       ret = btrfs_qgroup_account_extents(trans, fs_info);
        if (ret < 0) {
-               mutex_unlock(&root->fs_info->tree_log_mutex);
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->tree_log_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
        ret = commit_cowonly_roots(trans, root);
        if (ret) {
-               mutex_unlock(&root->fs_info->tree_log_mutex);
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->tree_log_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
@@ -2174,64 +2194,64 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         */
        if (unlikely(ACCESS_ONCE(cur_trans->aborted))) {
                ret = cur_trans->aborted;
-               mutex_unlock(&root->fs_info->tree_log_mutex);
-               mutex_unlock(&root->fs_info->reloc_mutex);
+               mutex_unlock(&fs_info->tree_log_mutex);
+               mutex_unlock(&fs_info->reloc_mutex);
                goto scrub_continue;
        }
 
        btrfs_prepare_extent_commit(trans, root);
 
-       cur_trans = root->fs_info->running_transaction;
+       cur_trans = fs_info->running_transaction;
 
-       btrfs_set_root_node(&root->fs_info->tree_root->root_item,
-                           root->fs_info->tree_root->node);
-       list_add_tail(&root->fs_info->tree_root->dirty_list,
+       btrfs_set_root_node(&fs_info->tree_root->root_item,
+                           fs_info->tree_root->node);
+       list_add_tail(&fs_info->tree_root->dirty_list,
                      &cur_trans->switch_commits);
 
-       btrfs_set_root_node(&root->fs_info->chunk_root->root_item,
-                           root->fs_info->chunk_root->node);
-       list_add_tail(&root->fs_info->chunk_root->dirty_list,
+       btrfs_set_root_node(&fs_info->chunk_root->root_item,
+                           fs_info->chunk_root->node);
+       list_add_tail(&fs_info->chunk_root->dirty_list,
                      &cur_trans->switch_commits);
 
-       switch_commit_roots(cur_trans, root->fs_info);
+       switch_commit_roots(cur_trans, fs_info);
 
        assert_qgroups_uptodate(trans);
        ASSERT(list_empty(&cur_trans->dirty_bgs));
        ASSERT(list_empty(&cur_trans->io_bgs));
        update_super_roots(root);
 
-       btrfs_set_super_log_root(root->fs_info->super_copy, 0);
-       btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
-       memcpy(root->fs_info->super_for_commit, root->fs_info->super_copy,
-              sizeof(*root->fs_info->super_copy));
+       btrfs_set_super_log_root(fs_info->super_copy, 0);
+       btrfs_set_super_log_root_level(fs_info->super_copy, 0);
+       memcpy(fs_info->super_for_commit, fs_info->super_copy,
+              sizeof(*fs_info->super_copy));
 
-       btrfs_update_commit_device_size(root->fs_info);
+       btrfs_update_commit_device_size(fs_info);
        btrfs_update_commit_device_bytes_used(root, cur_trans);
 
-       clear_bit(BTRFS_FS_LOG1_ERR, &root->fs_info->flags);
-       clear_bit(BTRFS_FS_LOG2_ERR, &root->fs_info->flags);
+       clear_bit(BTRFS_FS_LOG1_ERR, &fs_info->flags);
+       clear_bit(BTRFS_FS_LOG2_ERR, &fs_info->flags);
 
        btrfs_trans_release_chunk_metadata(trans);
 
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
        cur_trans->state = TRANS_STATE_UNBLOCKED;
-       root->fs_info->running_transaction = NULL;
-       spin_unlock(&root->fs_info->trans_lock);
-       mutex_unlock(&root->fs_info->reloc_mutex);
+       fs_info->running_transaction = NULL;
+       spin_unlock(&fs_info->trans_lock);
+       mutex_unlock(&fs_info->reloc_mutex);
 
-       wake_up(&root->fs_info->transaction_wait);
+       wake_up(&fs_info->transaction_wait);
 
        ret = btrfs_write_and_wait_transaction(trans, root);
        if (ret) {
-               btrfs_handle_fs_error(root->fs_info, ret,
-                           "Error while writing out transaction");
-               mutex_unlock(&root->fs_info->tree_log_mutex);
+               btrfs_handle_fs_error(fs_info, ret,
+                                     "Error while writing out transaction");
+               mutex_unlock(&fs_info->tree_log_mutex);
                goto scrub_continue;
        }
 
        ret = write_ctree_super(trans, root, 0);
        if (ret) {
-               mutex_unlock(&root->fs_info->tree_log_mutex);
+               mutex_unlock(&fs_info->tree_log_mutex);
                goto scrub_continue;
        }
 
@@ -2239,14 +2259,14 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         * the super is written, we can safely allow the tree-loggers
         * to go about their business
         */
-       mutex_unlock(&root->fs_info->tree_log_mutex);
+       mutex_unlock(&fs_info->tree_log_mutex);
 
        btrfs_finish_extent_commit(trans, root);
 
        if (test_bit(BTRFS_TRANS_HAVE_FREE_BGS, &cur_trans->flags))
-               btrfs_clear_space_info_full(root->fs_info);
+               btrfs_clear_space_info_full(fs_info);
 
-       root->fs_info->last_trans_committed = cur_trans->transid;
+       fs_info->last_trans_committed = cur_trans->transid;
        /*
         * We needn't acquire the lock here because there is no other task
         * which can change it.
@@ -2254,15 +2274,15 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
        cur_trans->state = TRANS_STATE_COMPLETED;
        wake_up(&cur_trans->commit_wait);
 
-       spin_lock(&root->fs_info->trans_lock);
+       spin_lock(&fs_info->trans_lock);
        list_del_init(&cur_trans->list);
-       spin_unlock(&root->fs_info->trans_lock);
+       spin_unlock(&fs_info->trans_lock);
 
        btrfs_put_transaction(cur_trans);
        btrfs_put_transaction(cur_trans);
 
        if (trans->type & __TRANS_FREEZABLE)
-               sb_end_intwrite(root->fs_info->sb);
+               sb_end_intwrite(fs_info->sb);
 
        trace_btrfs_transaction_commit(root);
 
@@ -2277,9 +2297,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         * If fs has been frozen, we can not handle delayed iputs, otherwise
         * it'll result in deadlock about SB_FREEZE_FS.
         */
-       if (current != root->fs_info->transaction_kthread &&
-           current != root->fs_info->cleaner_kthread &&
-           !root->fs_info->fs_frozen)
+       if (current != fs_info->transaction_kthread &&
+           current != fs_info->cleaner_kthread && !fs_info->fs_frozen)
                btrfs_run_delayed_iputs(root);
 
        return ret;
@@ -2290,7 +2309,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
        btrfs_trans_release_metadata(trans, root);
        btrfs_trans_release_chunk_metadata(trans);
        trans->block_rsv = NULL;
-       btrfs_warn(root->fs_info, "Skipping commit of aborted transaction.");
+       btrfs_warn(fs_info, "Skipping commit of aborted transaction.");
        if (current->journal_info == trans)
                current->journal_info = NULL;
        cleanup_transaction(trans, root, ret);
index ad3ae2ef0cd4f1dde3558879c1a6df127c31c435..dcb225e6a1c76f68cfffe6fde939cf943534a9c0 100644 (file)
@@ -142,12 +142,13 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
                           struct btrfs_log_ctx *ctx)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret = 0;
 
        mutex_lock(&root->log_mutex);
 
        if (root->log_root) {
-               if (btrfs_need_log_full_commit(root->fs_info, trans)) {
+               if (btrfs_need_log_full_commit(fs_info, trans)) {
                        ret = -EAGAIN;
                        goto out;
                }
@@ -159,10 +160,10 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
                        set_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state);
                }
        } else {
-               mutex_lock(&root->fs_info->tree_log_mutex);
-               if (!root->fs_info->log_root_tree)
-                       ret = btrfs_init_log_root_tree(trans, root->fs_info);
-               mutex_unlock(&root->fs_info->tree_log_mutex);
+               mutex_lock(&fs_info->tree_log_mutex);
+               if (!fs_info->log_root_tree)
+                       ret = btrfs_init_log_root_tree(trans, fs_info);
+               mutex_unlock(&fs_info->tree_log_mutex);
                if (ret)
                        goto out;
 
@@ -292,20 +293,21 @@ static int process_one_buffer(struct btrfs_root *log,
                              struct extent_buffer *eb,
                              struct walk_control *wc, u64 gen)
 {
+       struct btrfs_fs_info *fs_info = log->fs_info;
        int ret = 0;
 
        /*
         * If this fs is mixed then we need to be able to process the leaves to
         * pin down any logged extents, so we have to read the block.
         */
-       if (btrfs_fs_incompat(log->fs_info, MIXED_GROUPS)) {
+       if (btrfs_fs_incompat(fs_info, MIXED_GROUPS)) {
                ret = btrfs_read_buffer(eb, gen);
                if (ret)
                        return ret;
        }
 
        if (wc->pin)
-               ret = btrfs_pin_extent_for_log_replay(log->fs_info->extent_root,
+               ret = btrfs_pin_extent_for_log_replay(fs_info->extent_root,
                                                      eb->start, eb->len);
 
        if (!ret && btrfs_buffer_uptodate(eb, gen, 0)) {
@@ -582,6 +584,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
                                      struct extent_buffer *eb, int slot,
                                      struct btrfs_key *key)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int found_type;
        u64 extent_end;
        u64 start = key->offset;
@@ -609,7 +612,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
                size = btrfs_file_extent_inline_len(eb, slot, item);
                nbytes = btrfs_file_extent_ram_bytes(eb, item);
                extent_end = ALIGN(start + size,
-                                  root->fs_info->sectorsize);
+                                  fs_info->sectorsize);
        } else {
                ret = 0;
                goto out;
@@ -690,7 +693,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
                 * as the owner of the file extent changed from log tree
                 * (doesn't affect qgroup) to fs/file tree(affects qgroup)
                 */
-               ret = btrfs_qgroup_trace_extent(trans, root->fs_info,
+               ret = btrfs_qgroup_trace_extent(trans, fs_info,
                                btrfs_file_extent_disk_bytenr(eb, item),
                                btrfs_file_extent_disk_num_bytes(eb, item),
                                GFP_NOFS);
@@ -797,14 +800,12 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
                                                struct btrfs_ordered_sum,
                                                list);
                                if (!ret)
-                                       ret = btrfs_del_csums(trans,
-                                                             root->fs_info,
+                                       ret = btrfs_del_csums(trans, fs_info,
                                                              sums->bytenr,
                                                              sums->len);
                                if (!ret)
                                        ret = btrfs_csum_file_blocks(trans,
-                                               root->fs_info->csum_root,
-                                               sums);
+                                               fs_info->csum_root, sums);
                                list_del(&sums->list);
                                kfree(sums);
                        }
@@ -2408,6 +2409,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
                                   struct btrfs_path *path, int *level,
                                   struct walk_control *wc)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 root_owner;
        u64 bytenr;
        u64 ptr_gen;
@@ -2433,7 +2435,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
 
                bytenr = btrfs_node_blockptr(cur, path->slots[*level]);
                ptr_gen = btrfs_node_ptr_generation(cur, path->slots[*level]);
-               blocksize = root->fs_info->nodesize;
+               blocksize = fs_info->nodesize;
 
                parent = path->nodes[*level];
                root_owner = btrfs_header_owner(parent);
@@ -2460,8 +2462,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
                                if (trans) {
                                        btrfs_tree_lock(next);
                                        btrfs_set_lock_blocking(next);
-                                       clean_tree_block(trans, root->fs_info,
-                                                       next);
+                                       clean_tree_block(trans, fs_info, next);
                                        btrfs_wait_tree_block_writeback(next);
                                        btrfs_tree_unlock(next);
                                }
@@ -2506,6 +2507,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
                                 struct btrfs_path *path, int *level,
                                 struct walk_control *wc)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 root_owner;
        int i;
        int slot;
@@ -2539,8 +2541,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
                                if (trans) {
                                        btrfs_tree_lock(next);
                                        btrfs_set_lock_blocking(next);
-                                       clean_tree_block(trans, root->fs_info,
-                                                       next);
+                                       clean_tree_block(trans, fs_info, next);
                                        btrfs_wait_tree_block_writeback(next);
                                        btrfs_tree_unlock(next);
                                }
@@ -2642,14 +2643,15 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,
 static int update_log_root(struct btrfs_trans_handle *trans,
                           struct btrfs_root *log)
 {
+       struct btrfs_fs_info *fs_info = log->fs_info;
        int ret;
 
        if (log->log_transid == 1) {
                /* insert root item on the first sync */
-               ret = btrfs_insert_root(trans, log->fs_info->log_root_tree,
+               ret = btrfs_insert_root(trans, fs_info->log_root_tree,
                                &log->root_key, &log->root_item);
        } else {
-               ret = btrfs_update_root(trans, log->fs_info->log_root_tree,
+               ret = btrfs_update_root(trans, fs_info->log_root_tree,
                                &log->root_key, &log->root_item);
        }
        return ret;
@@ -2743,8 +2745,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
        int index2;
        int mark;
        int ret;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *log = root->log_root;
-       struct btrfs_root *log_root_tree = root->fs_info->log_root_tree;
+       struct btrfs_root *log_root_tree = fs_info->log_root_tree;
        int log_transid = 0;
        struct btrfs_log_ctx root_log_ctx;
        struct blk_plug plug;
@@ -2772,7 +2775,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
        while (1) {
                int batch = atomic_read(&root->log_batch);
                /* when we're on an ssd, just kick the log commit out */
-               if (!btrfs_test_opt(root->fs_info, SSD) &&
+               if (!btrfs_test_opt(fs_info, SSD) &&
                    test_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state)) {
                        mutex_unlock(&root->log_mutex);
                        schedule_timeout_uninterruptible(1);
@@ -2784,7 +2787,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
        }
 
        /* bail out if we need to do a full commit */
-       if (btrfs_need_log_full_commit(root->fs_info, trans)) {
+       if (btrfs_need_log_full_commit(fs_info, trans)) {
                ret = -EAGAIN;
                btrfs_free_logged_extents(log, log_transid);
                mutex_unlock(&root->log_mutex);
@@ -2805,7 +2808,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
                blk_finish_plug(&plug);
                btrfs_abort_transaction(trans, ret);
                btrfs_free_logged_extents(log, log_transid);
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
                mutex_unlock(&root->log_mutex);
                goto out;
        }
@@ -2850,7 +2853,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
                        list_del_init(&root_log_ctx.list);
 
                blk_finish_plug(&plug);
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
 
                if (ret != -ENOSPC) {
                        btrfs_abort_transaction(trans, ret);
@@ -2899,7 +2902,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
         * now that we've moved on to the tree of log tree roots,
         * check the full commit flag again
         */
-       if (btrfs_need_log_full_commit(root->fs_info, trans)) {
+       if (btrfs_need_log_full_commit(fs_info, trans)) {
                blk_finish_plug(&plug);
                btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
                btrfs_free_logged_extents(log, log_transid);
@@ -2913,7 +2916,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
                                         EXTENT_DIRTY | EXTENT_NEW);
        blk_finish_plug(&plug);
        if (ret) {
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
                btrfs_abort_transaction(trans, ret);
                btrfs_free_logged_extents(log, log_transid);
                mutex_unlock(&log_root_tree->log_mutex);
@@ -2925,17 +2928,17 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
                                                &log_root_tree->dirty_log_pages,
                                                EXTENT_NEW | EXTENT_DIRTY);
        if (ret) {
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
                btrfs_free_logged_extents(log, log_transid);
                mutex_unlock(&log_root_tree->log_mutex);
                goto out_wake_log_root;
        }
        btrfs_wait_logged_extents(trans, log, log_transid);
 
-       btrfs_set_super_log_root(root->fs_info->super_for_commit,
-                               log_root_tree->node->start);
-       btrfs_set_super_log_root_level(root->fs_info->super_for_commit,
-                               btrfs_header_level(log_root_tree->node));
+       btrfs_set_super_log_root(fs_info->super_for_commit,
+                                log_root_tree->node->start);
+       btrfs_set_super_log_root_level(fs_info->super_for_commit,
+                                      btrfs_header_level(log_root_tree->node));
 
        log_root_tree->log_transid++;
        mutex_unlock(&log_root_tree->log_mutex);
@@ -2947,9 +2950,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
         * the running transaction open, so a full commit can't hop
         * in and cause problems either.
         */
-       ret = write_ctree_super(trans, root->fs_info->tree_root, 1);
+       ret = write_ctree_super(trans, fs_info->tree_root, 1);
        if (ret) {
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
                btrfs_abort_transaction(trans, ret);
                goto out_wake_log_root;
        }
@@ -3183,6 +3186,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
                               const char *name, int name_len,
                               struct inode *inode, u64 dirid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *log;
        u64 index;
        int ret;
@@ -3200,7 +3204,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
                                  dirid, &index);
        mutex_unlock(&BTRFS_I(inode)->log_mutex);
        if (ret == -ENOSPC) {
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
                ret = 0;
        } else if (ret < 0 && ret != -ENOENT)
                btrfs_abort_transaction(trans, ret);
@@ -3607,6 +3611,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                               int start_slot, int nr, int inode_only,
                               u64 logged_isize)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        unsigned long src_offset;
        unsigned long dst_offset;
        struct btrfs_root *log = BTRFS_I(inode)->root->log_root;
@@ -3717,7 +3722,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                                }
 
                                ret = btrfs_lookup_csums_range(
-                                               log->fs_info->csum_root,
+                                               fs_info->csum_root,
                                                ds + cs, ds + cs + cl - 1,
                                                &ordered_sums, 0);
                                if (ret) {
@@ -3790,7 +3795,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                                                           src_path->slots[0],
                                                           extent);
                        *last_extent = ALIGN(key.offset + len,
-                                            log->fs_info->sectorsize);
+                                            fs_info->sectorsize);
                } else {
                        len = btrfs_file_extent_num_bytes(src, extent);
                        *last_extent = key.offset + len;
@@ -3854,7 +3859,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                    BTRFS_FILE_EXTENT_INLINE) {
                        len = btrfs_file_extent_inline_len(src, i, extent);
                        extent_end = ALIGN(key.offset + len,
-                                          log->fs_info->sectorsize);
+                                          fs_info->sectorsize);
                } else {
                        len = btrfs_file_extent_num_bytes(src, extent);
                        extent_end = key.offset + len;
@@ -3904,6 +3909,7 @@ static int wait_ordered_extents(struct btrfs_trans_handle *trans,
                                const struct list_head *logged_list,
                                bool *ordered_io_error)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_ordered_extent *ordered;
        struct btrfs_root *log = root->log_root;
        u64 mod_start = em->mod_start;
@@ -4020,7 +4026,7 @@ static int wait_ordered_extents(struct btrfs_trans_handle *trans,
        }
 
        /* block start is already adjusted for the file extent offset. */
-       ret = btrfs_lookup_csums_range(log->fs_info->csum_root,
+       ret = btrfs_lookup_csums_range(fs_info->csum_root,
                                       em->block_start + csum_offset,
                                       em->block_start + csum_offset +
                                       csum_len - 1, &ordered_sums, 0);
@@ -4363,6 +4369,7 @@ static int btrfs_log_trailing_hole(struct btrfs_trans_handle *trans,
                                   struct inode *inode,
                                   struct btrfs_path *path)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        struct btrfs_key key;
        u64 hole_start;
@@ -4372,7 +4379,7 @@ static int btrfs_log_trailing_hole(struct btrfs_trans_handle *trans,
        const u64 ino = btrfs_ino(inode);
        const u64 i_size = i_size_read(inode);
 
-       if (!btrfs_fs_incompat(root->fs_info, NO_HOLES))
+       if (!btrfs_fs_incompat(fs_info, NO_HOLES))
                return 0;
 
        key.objectid = ino;
@@ -4429,7 +4436,7 @@ static int btrfs_log_trailing_hole(struct btrfs_trans_handle *trans,
        if (hole_size == 0)
                return 0;
 
-       hole_size = ALIGN(hole_size, root->fs_info->sectorsize);
+       hole_size = ALIGN(hole_size, fs_info->sectorsize);
        ret = btrfs_insert_file_extent(trans, log, ino, hole_start, 0, 0,
                                       hole_size, 0, hole_size, 0, 0, 0);
        return ret;
@@ -4587,6 +4594,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
                           const loff_t end,
                           struct btrfs_log_ctx *ctx)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        struct btrfs_path *dst_path;
        struct btrfs_key min_key;
@@ -4639,7 +4647,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
         * fixup (create temporary BTRFS_TREE_LOG_FIXUP_OBJECTID items).
         */
        if (S_ISDIR(inode->i_mode) ||
-           BTRFS_I(inode)->generation > root->fs_info->last_trans_committed)
+           BTRFS_I(inode)->generation > fs_info->last_trans_committed)
                ret = btrfs_commit_inode_delayed_items(trans, inode);
        else
                ret = btrfs_commit_inode_delayed_inode(inode);
@@ -4776,7 +4784,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
                                inode_key.objectid = other_ino;
                                inode_key.type = BTRFS_INODE_ITEM_KEY;
                                inode_key.offset = 0;
-                               other_inode = btrfs_iget(root->fs_info->sb,
+                               other_inode = btrfs_iget(fs_info->sb,
                                                         &inode_key, root,
                                                         NULL);
                                /*
@@ -5140,6 +5148,7 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
                                struct inode *start_inode,
                                struct btrfs_log_ctx *ctx)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *log = root->log_root;
        struct btrfs_path *path;
        LIST_HEAD(dir_list);
@@ -5207,8 +5216,7 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
                        if (di_key.type == BTRFS_ROOT_ITEM_KEY)
                                continue;
 
-                       di_inode = btrfs_iget(root->fs_info->sb, &di_key,
-                                             root, NULL);
+                       di_inode = btrfs_iget(fs_info->sb, &di_key, root, NULL);
                        if (IS_ERR(di_inode)) {
                                ret = PTR_ERR(di_inode);
                                goto next_dir_inode;
@@ -5270,6 +5278,7 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
                                 struct inode *inode,
                                 struct btrfs_log_ctx *ctx)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        int ret;
        struct btrfs_path *path;
        struct btrfs_key key;
@@ -5334,7 +5343,7 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
                                cur_offset = item_size;
                        }
 
-                       dir_inode = btrfs_iget(root->fs_info->sb, &inode_key,
+                       dir_inode = btrfs_iget(fs_info->sb, &inode_key,
                                               root, NULL);
                        /* If parent inode was deleted, skip it. */
                        if (IS_ERR(dir_inode))
@@ -5376,17 +5385,18 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
                                  int exists_only,
                                  struct btrfs_log_ctx *ctx)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int inode_only = exists_only ? LOG_INODE_EXISTS : LOG_INODE_ALL;
        struct super_block *sb;
        struct dentry *old_parent = NULL;
        int ret = 0;
-       u64 last_committed = root->fs_info->last_trans_committed;
+       u64 last_committed = fs_info->last_trans_committed;
        bool log_dentries = false;
        struct inode *orig_inode = inode;
 
        sb = inode->i_sb;
 
-       if (btrfs_test_opt(root->fs_info, NOTREELOG)) {
+       if (btrfs_test_opt(fs_info, NOTREELOG)) {
                ret = 1;
                goto end_no_trans;
        }
@@ -5395,8 +5405,8 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
         * The prev transaction commit doesn't complete, we need do
         * full commit by ourselves.
         */
-       if (root->fs_info->last_trans_log_full_commit >
-           root->fs_info->last_trans_committed) {
+       if (fs_info->last_trans_log_full_commit >
+           fs_info->last_trans_committed) {
                ret = 1;
                goto end_no_trans;
        }
@@ -5517,7 +5527,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
 end_trans:
        dput(old_parent);
        if (ret < 0) {
-               btrfs_set_log_full_commit(root->fs_info, trans);
+               btrfs_set_log_full_commit(fs_info, trans);
                ret = 1;
        }
 
@@ -5788,6 +5798,7 @@ int btrfs_log_new_name(struct btrfs_trans_handle *trans,
                        struct inode *inode, struct inode *old_dir,
                        struct dentry *parent)
 {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root * root = BTRFS_I(inode)->root;
 
        /*
@@ -5802,9 +5813,9 @@ int btrfs_log_new_name(struct btrfs_trans_handle *trans,
         * from hasn't been logged, we don't need to log it
         */
        if (BTRFS_I(inode)->logged_trans <=
-           root->fs_info->last_trans_committed &&
+           fs_info->last_trans_committed &&
            (!old_dir || BTRFS_I(old_dir)->logged_trans <=
-                   root->fs_info->last_trans_committed))
+                   fs_info->last_trans_committed))
                return 0;
 
        return btrfs_log_inode_parent(trans, root, inode, parent, 0,
index e63846edb923f768e16d65b364c0a137efd7f3e1..4464e80bb5efe3039edbc79769e7bd85fdc425c8 100644 (file)
@@ -187,8 +187,8 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans,
 
        ret = btrfs_search_slot(trans, uuid_root, &key, path, -1, 1);
        if (ret < 0) {
-               btrfs_warn(uuid_root->fs_info,
-                          "error %d while searching for uuid item!", ret);
+               btrfs_warn(fs_info, "error %d while searching for uuid item!",
+                          ret);
                goto out;
        }
        if (ret > 0) {
@@ -201,8 +201,7 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans,
        offset = btrfs_item_ptr_offset(eb, slot);
        item_size = btrfs_item_size_nr(eb, slot);
        if (!IS_ALIGNED(item_size, sizeof(u64))) {
-               btrfs_warn(uuid_root->fs_info,
-                          "uuid item with illegal size %lu!",
+               btrfs_warn(fs_info, "uuid item with illegal size %lu!",
                           (unsigned long)item_size);
                ret = -ENOENT;
                goto out;
index 9535828830346f2ed35730ae9a512df97e530232..f983d258bf5cbc0b803b2ce7585120968574b4e1 100644 (file)
@@ -343,9 +343,9 @@ static void requeue_list(struct btrfs_pending_bios *pending_bios,
  */
 static noinline void run_scheduled_bios(struct btrfs_device *device)
 {
+       struct btrfs_fs_info *fs_info = device->fs_info;
        struct bio *pending;
        struct backing_dev_info *bdi;
-       struct btrfs_fs_info *fs_info;
        struct btrfs_pending_bios *pending_bios;
        struct bio *tail;
        struct bio *cur;
@@ -367,7 +367,6 @@ static noinline void run_scheduled_bios(struct btrfs_device *device)
        blk_start_plug(&plug);
 
        bdi = blk_get_backing_dev_info(device->bdev);
-       fs_info = device->fs_info;
        limit = btrfs_async_submit_limit(fs_info);
        limit = limit * 2 / 3;
 
@@ -1338,7 +1337,8 @@ int find_free_dev_extent_start(struct btrfs_transaction *transaction,
                               struct btrfs_device *device, u64 num_bytes,
                               u64 search_start, u64 *start, u64 *len)
 {
-       struct btrfs_root *root = device->fs_info->dev_root;
+       struct btrfs_fs_info *fs_info = device->fs_info;
+       struct btrfs_root *root = fs_info->dev_root;
        struct btrfs_key key;
        struct btrfs_dev_extent *dev_extent;
        struct btrfs_path *path;
@@ -1357,7 +1357,7 @@ int find_free_dev_extent_start(struct btrfs_transaction *transaction,
         * used by the boot loader (grub for example), so we make sure to start
         * at an offset of at least 1MB.
         */
-       min_search_start = max(root->fs_info->alloc_start, 1024ull * 1024);
+       min_search_start = max(fs_info->alloc_start, 1024ull * 1024);
        search_start = max(search_start, min_search_start);
 
        path = btrfs_alloc_path();
@@ -1508,7 +1508,8 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans,
                          struct btrfs_device *device,
                          u64 start, u64 *dev_extent_len)
 {
-       struct btrfs_root *root = device->fs_info->dev_root;
+       struct btrfs_fs_info *fs_info = device->fs_info;
+       struct btrfs_root *root = fs_info->dev_root;
        int ret;
        struct btrfs_path *path;
        struct btrfs_key key;
@@ -1544,7 +1545,7 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans,
                extent = btrfs_item_ptr(leaf, path->slots[0],
                                        struct btrfs_dev_extent);
        } else {
-               btrfs_handle_fs_error(root->fs_info, ret, "Slot search failed");
+               btrfs_handle_fs_error(fs_info, ret, "Slot search failed");
                goto out;
        }
 
@@ -1552,8 +1553,8 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans,
 
        ret = btrfs_del_item(trans, root, path);
        if (ret) {
-               btrfs_handle_fs_error(root->fs_info, ret,
-                           "Failed to remove dev extent item");
+               btrfs_handle_fs_error(fs_info, ret,
+                                     "Failed to remove dev extent item");
        } else {
                set_bit(BTRFS_TRANS_HAVE_FREE_BGS, &trans->transaction->flags);
        }
@@ -1569,7 +1570,8 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
 {
        int ret;
        struct btrfs_path *path;
-       struct btrfs_root *root = device->fs_info->dev_root;
+       struct btrfs_fs_info *fs_info = device->fs_info;
+       struct btrfs_root *root = fs_info->dev_root;
        struct btrfs_dev_extent *extent;
        struct extent_buffer *leaf;
        struct btrfs_key key;
@@ -1595,8 +1597,7 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
        btrfs_set_dev_extent_chunk_objectid(leaf, extent, chunk_objectid);
        btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);
 
-       write_extent_buffer_chunk_tree_uuid(leaf,
-                       root->fs_info->chunk_tree_uuid);
+       write_extent_buffer_chunk_tree_uuid(leaf, fs_info->chunk_tree_uuid);
 
        btrfs_set_dev_extent_length(leaf, extent, num_bytes);
        btrfs_mark_buffer_dirty(leaf);
@@ -1712,7 +1713,7 @@ static int btrfs_add_device(struct btrfs_trans_handle *trans,
        ptr = btrfs_device_uuid(dev_item);
        write_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);
        ptr = btrfs_device_fsid(dev_item);
-       write_extent_buffer(leaf, root->fs_info->fsid, ptr, BTRFS_UUID_SIZE);
+       write_extent_buffer(leaf, fs_info->fsid, ptr, BTRFS_UUID_SIZE);
        btrfs_mark_buffer_dirty(leaf);
 
        ret = 0;
@@ -1853,6 +1854,7 @@ void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,
 
 int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_device *device;
        struct btrfs_fs_devices *cur_devices;
        u64 num_devices;
@@ -1861,15 +1863,15 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
 
        mutex_lock(&uuid_mutex);
 
-       num_devices = root->fs_info->fs_devices->num_devices;
-       btrfs_dev_replace_lock(&root->fs_info->dev_replace, 0);
-       if (btrfs_dev_replace_is_ongoing(&root->fs_info->dev_replace)) {
+       num_devices = fs_info->fs_devices->num_devices;
+       btrfs_dev_replace_lock(&fs_info->dev_replace, 0);
+       if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace)) {
                WARN_ON(num_devices < 1);
                num_devices--;
        }
-       btrfs_dev_replace_unlock(&root->fs_info->dev_replace, 0);
+       btrfs_dev_replace_unlock(&fs_info->dev_replace, 0);
 
-       ret = btrfs_check_raid_min_devices(root->fs_info, num_devices - 1);
+       ret = btrfs_check_raid_min_devices(fs_info, num_devices - 1);
        if (ret)
                goto out;
 
@@ -1883,16 +1885,16 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
                goto out;
        }
 
-       if (device->writeable && root->fs_info->fs_devices->rw_devices == 1) {
+       if (device->writeable && fs_info->fs_devices->rw_devices == 1) {
                ret = BTRFS_ERROR_DEV_ONLY_WRITABLE;
                goto out;
        }
 
        if (device->writeable) {
-               lock_chunks(root->fs_info);
+               lock_chunks(fs_info);
                list_del_init(&device->dev_alloc_list);
                device->fs_devices->rw_devices--;
-               unlock_chunks(root->fs_info);
+               unlock_chunks(fs_info);
                clear_super = true;
        }
 
@@ -1907,12 +1909,12 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
         * counter although write_all_supers() is not locked out. This
         * could give a filesystem state which requires a degraded mount.
         */
-       ret = btrfs_rm_dev_item(root->fs_info, device);
+       ret = btrfs_rm_dev_item(fs_info, device);
        if (ret)
                goto error_undo;
 
        device->in_fs_metadata = 0;
-       btrfs_scrub_cancel_dev(root->fs_info, device);
+       btrfs_scrub_cancel_dev(fs_info, device);
 
        /*
         * the device list mutex makes sure that we don't change
@@ -1925,7 +1927,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
         */
 
        cur_devices = device->fs_devices;
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
        list_del_rcu(&device->dev_list);
 
        device->fs_devices->num_devices--;
@@ -1934,17 +1936,17 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
        if (device->missing)
                device->fs_devices->missing_devices--;
 
-       btrfs_assign_next_active_device(root->fs_info, device, NULL);
+       btrfs_assign_next_active_device(fs_info, device, NULL);
 
        if (device->bdev) {
                device->fs_devices->open_devices--;
                /* remove sysfs entry */
-               btrfs_sysfs_rm_device_link(root->fs_info->fs_devices, device);
+               btrfs_sysfs_rm_device_link(fs_info->fs_devices, device);
        }
 
-       num_devices = btrfs_super_num_devices(root->fs_info->super_copy) - 1;
-       btrfs_set_super_num_devices(root->fs_info->super_copy, num_devices);
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       num_devices = btrfs_super_num_devices(fs_info->super_copy) - 1;
+       btrfs_set_super_num_devices(fs_info->super_copy, num_devices);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
        /*
         * at this point, the device is zero sized and detached from
@@ -1959,7 +1961,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
 
        if (cur_devices->open_devices == 0) {
                struct btrfs_fs_devices *fs_devices;
-               fs_devices = root->fs_info->fs_devices;
+               fs_devices = fs_info->fs_devices;
                while (fs_devices) {
                        if (fs_devices->seed == cur_devices) {
                                fs_devices->seed = cur_devices->seed;
@@ -1972,8 +1974,8 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
                free_fs_devices(cur_devices);
        }
 
-       root->fs_info->num_tolerated_disk_barrier_failures =
-               btrfs_calc_num_tolerated_disk_barrier_failures(root->fs_info);
+       fs_info->num_tolerated_disk_barrier_failures =
+               btrfs_calc_num_tolerated_disk_barrier_failures(fs_info);
 
 out:
        mutex_unlock(&uuid_mutex);
@@ -1981,11 +1983,11 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
 
 error_undo:
        if (device->writeable) {
-               lock_chunks(root->fs_info);
+               lock_chunks(fs_info);
                list_add(&device->dev_alloc_list,
-                        &root->fs_info->fs_devices->alloc_list);
+                        &fs_info->fs_devices->alloc_list);
                device->fs_devices->rw_devices++;
-               unlock_chunks(root->fs_info);
+               unlock_chunks(fs_info);
        }
        goto out;
 }
@@ -2093,6 +2095,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
 static int btrfs_find_device_by_path(struct btrfs_root *root, char *device_path,
                                     struct btrfs_device **device)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret = 0;
        struct btrfs_super_block *disk_super;
        u64 devid;
@@ -2102,14 +2105,13 @@ static int btrfs_find_device_by_path(struct btrfs_root *root, char *device_path,
 
        *device = NULL;
        ret = btrfs_get_bdev_and_sb(device_path, FMODE_READ,
-                                   root->fs_info->bdev_holder, 0, &bdev, &bh);
+                                   fs_info->bdev_holder, 0, &bdev, &bh);
        if (ret)
                return ret;
        disk_super = (struct btrfs_super_block *)bh->b_data;
        devid = btrfs_stack_device_id(&disk_super->dev_item);
        dev_uuid = disk_super->dev_item.uuid;
-       *device = btrfs_find_device(root->fs_info, devid, dev_uuid,
-                                   disk_super->fsid);
+       *device = btrfs_find_device(fs_info, devid, dev_uuid, disk_super->fsid);
        brelse(bh);
        if (!*device)
                ret = -ENOENT;
@@ -2121,12 +2123,14 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_root *root,
                                         char *device_path,
                                         struct btrfs_device **device)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
+
        *device = NULL;
        if (strcmp(device_path, "missing") == 0) {
                struct list_head *devices;
                struct btrfs_device *tmp;
 
-               devices = &root->fs_info->fs_devices->devices;
+               devices = &fs_info->fs_devices->devices;
                /*
                 * It is safe to read the devices since the volume_mutex
                 * is held by the caller.
@@ -2154,12 +2158,12 @@ int btrfs_find_device_by_devspec(struct btrfs_root *root, u64 devid,
                                         char *devpath,
                                         struct btrfs_device **device)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
 
        if (devid) {
                ret = 0;
-               *device = btrfs_find_device(root->fs_info, devid, NULL,
-                                           NULL);
+               *device = btrfs_find_device(fs_info, devid, NULL, NULL);
                if (!*device)
                        ret = -ENOENT;
        } else {
@@ -2177,10 +2181,11 @@ int btrfs_find_device_by_devspec(struct btrfs_root *root, u64 devid,
  */
 static int btrfs_prepare_sprout(struct btrfs_root *root)
 {
-       struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        struct btrfs_fs_devices *old_devices;
        struct btrfs_fs_devices *seed_devices;
-       struct btrfs_super_block *disk_super = root->fs_info->super_copy;
+       struct btrfs_super_block *disk_super = fs_info->super_copy;
        struct btrfs_device *device;
        u64 super_flags;
 
@@ -2206,15 +2211,15 @@ static int btrfs_prepare_sprout(struct btrfs_root *root)
        INIT_LIST_HEAD(&seed_devices->alloc_list);
        mutex_init(&seed_devices->device_list_mutex);
 
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
        list_splice_init_rcu(&fs_devices->devices, &seed_devices->devices,
                              synchronize_rcu);
        list_for_each_entry(device, &seed_devices->devices, dev_list)
                device->fs_devices = seed_devices;
 
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
        list_splice_init(&fs_devices->alloc_list, &seed_devices->alloc_list);
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
 
        fs_devices->seeding = 0;
        fs_devices->num_devices = 0;
@@ -2224,9 +2229,9 @@ static int btrfs_prepare_sprout(struct btrfs_root *root)
        fs_devices->seed = seed_devices;
 
        generate_random_uuid(fs_devices->fsid);
-       memcpy(root->fs_info->fsid, fs_devices->fsid, BTRFS_FSID_SIZE);
+       memcpy(fs_info->fsid, fs_devices->fsid, BTRFS_FSID_SIZE);
        memcpy(disk_super->fsid, fs_devices->fsid, BTRFS_FSID_SIZE);
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
        super_flags = btrfs_super_flags(disk_super) &
                      ~BTRFS_SUPER_FLAG_SEEDING;
@@ -2291,8 +2296,7 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans,
                                   BTRFS_UUID_SIZE);
                read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item),
                                   BTRFS_UUID_SIZE);
-               device = btrfs_find_device(root->fs_info, devid, dev_uuid,
-                                          fs_uuid);
+               device = btrfs_find_device(fs_info, devid, dev_uuid, fs_uuid);
                BUG_ON(!device); /* Logic error */
 
                if (device->fs_devices->seeding) {
@@ -2318,21 +2322,21 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
        struct btrfs_device *device;
        struct block_device *bdev;
        struct list_head *devices;
-       struct super_block *sb = root->fs_info->sb;
+       struct super_block *sb = fs_info->sb;
        struct rcu_string *name;
        u64 tmp;
        int seeding_dev = 0;
        int ret = 0;
 
-       if ((sb->s_flags & MS_RDONLY) && !root->fs_info->fs_devices->seeding)
+       if ((sb->s_flags & MS_RDONLY) && !fs_info->fs_devices->seeding)
                return -EROFS;
 
        bdev = blkdev_get_by_path(device_path, FMODE_WRITE | FMODE_EXCL,
-                                 root->fs_info->bdev_holder);
+                                 fs_info->bdev_holder);
        if (IS_ERR(bdev))
                return PTR_ERR(bdev);
 
-       if (root->fs_info->fs_devices->seeding) {
+       if (fs_info->fs_devices->seeding) {
                seeding_dev = 1;
                down_write(&sb->s_umount);
                mutex_lock(&uuid_mutex);
@@ -2340,20 +2344,20 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
 
        filemap_write_and_wait(bdev->bd_inode->i_mapping);
 
-       devices = &root->fs_info->fs_devices->devices;
+       devices = &fs_info->fs_devices->devices;
 
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
        list_for_each_entry(device, devices, dev_list) {
                if (device->bdev == bdev) {
                        ret = -EEXIST;
                        mutex_unlock(
-                               &root->fs_info->fs_devices->device_list_mutex);
+                               &fs_info->fs_devices->device_list_mutex);
                        goto error;
                }
        }
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
-       device = btrfs_alloc_device(root->fs_info, NULL, NULL);
+       device = btrfs_alloc_device(fs_info, NULL, NULL);
        if (IS_ERR(device)) {
                /* we can safely leave the fs_devices entry around */
                ret = PTR_ERR(device);
@@ -2381,9 +2385,9 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
                device->can_discard = 1;
        device->writeable = 1;
        device->generation = trans->transid;
-       device->io_width = root->fs_info->sectorsize;
-       device->io_align = root->fs_info->sectorsize;
-       device->sector_size = root->fs_info->sectorsize;
+       device->io_width = fs_info->sectorsize;
+       device->io_align = fs_info->sectorsize;
+       device->sector_size = fs_info->sectorsize;
        device->total_bytes = i_size_read(bdev->bd_inode);
        device->disk_total_bytes = device->total_bytes;
        device->commit_total_bytes = device->total_bytes;
@@ -2401,57 +2405,56 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
                BUG_ON(ret); /* -ENOMEM */
        }
 
-       device->fs_devices = root->fs_info->fs_devices;
+       device->fs_devices = fs_info->fs_devices;
 
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
-       lock_chunks(root->fs_info);
-       list_add_rcu(&device->dev_list, &root->fs_info->fs_devices->devices);
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
+       lock_chunks(fs_info);
+       list_add_rcu(&device->dev_list, &fs_info->fs_devices->devices);
        list_add(&device->dev_alloc_list,
-                &root->fs_info->fs_devices->alloc_list);
-       root->fs_info->fs_devices->num_devices++;
-       root->fs_info->fs_devices->open_devices++;
-       root->fs_info->fs_devices->rw_devices++;
-       root->fs_info->fs_devices->total_devices++;
-       root->fs_info->fs_devices->total_rw_bytes += device->total_bytes;
+                &fs_info->fs_devices->alloc_list);
+       fs_info->fs_devices->num_devices++;
+       fs_info->fs_devices->open_devices++;
+       fs_info->fs_devices->rw_devices++;
+       fs_info->fs_devices->total_devices++;
+       fs_info->fs_devices->total_rw_bytes += device->total_bytes;
 
-       spin_lock(&root->fs_info->free_chunk_lock);
-       root->fs_info->free_chunk_space += device->total_bytes;
-       spin_unlock(&root->fs_info->free_chunk_lock);
+       spin_lock(&fs_info->free_chunk_lock);
+       fs_info->free_chunk_space += device->total_bytes;
+       spin_unlock(&fs_info->free_chunk_lock);
 
        if (!blk_queue_nonrot(bdev_get_queue(bdev)))
-               root->fs_info->fs_devices->rotating = 1;
+               fs_info->fs_devices->rotating = 1;
 
-       tmp = btrfs_super_total_bytes(root->fs_info->super_copy);
-       btrfs_set_super_total_bytes(root->fs_info->super_copy,
+       tmp = btrfs_super_total_bytes(fs_info->super_copy);
+       btrfs_set_super_total_bytes(fs_info->super_copy,
                                    tmp + device->total_bytes);
 
-       tmp = btrfs_super_num_devices(root->fs_info->super_copy);
-       btrfs_set_super_num_devices(root->fs_info->super_copy,
-                                   tmp + 1);
+       tmp = btrfs_super_num_devices(fs_info->super_copy);
+       btrfs_set_super_num_devices(fs_info->super_copy, tmp + 1);
 
        /* add sysfs device entry */
-       btrfs_sysfs_add_device_link(root->fs_info->fs_devices, device);
+       btrfs_sysfs_add_device_link(fs_info->fs_devices, device);
 
        /*
         * we've got more storage, clear any full flags on the space
         * infos
         */
-       btrfs_clear_space_info_full(root->fs_info);
+       btrfs_clear_space_info_full(fs_info);
 
-       unlock_chunks(root->fs_info);
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       unlock_chunks(fs_info);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
        if (seeding_dev) {
-               lock_chunks(root->fs_info);
+               lock_chunks(fs_info);
                ret = init_first_rw_device(trans, root, device);
-               unlock_chunks(root->fs_info);
+               unlock_chunks(fs_info);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
                        goto error_trans;
                }
        }
 
-       ret = btrfs_add_device(trans, root->fs_info, device);
+       ret = btrfs_add_device(trans, fs_info, device);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                goto error_trans;
@@ -2460,7 +2463,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
        if (seeding_dev) {
                char fsid_buf[BTRFS_UUID_UNPARSED_SIZE];
 
-               ret = btrfs_finish_sprout(trans, root->fs_info);
+               ret = btrfs_finish_sprout(trans, fs_info);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
                        goto error_trans;
@@ -2470,15 +2473,14 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
                 * so rename the fsid on the sysfs
                 */
                snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU",
-                                               root->fs_info->fsid);
-               if (kobject_rename(&root->fs_info->fs_devices->fsid_kobj,
-                                                               fsid_buf))
-                       btrfs_warn(root->fs_info,
-                               "sysfs: failed to create fsid for sprout");
+                                               fs_info->fsid);
+               if (kobject_rename(&fs_info->fs_devices->fsid_kobj, fsid_buf))
+                       btrfs_warn(fs_info,
+                                  "sysfs: failed to create fsid for sprout");
        }
 
-       root->fs_info->num_tolerated_disk_barrier_failures =
-               btrfs_calc_num_tolerated_disk_barrier_failures(root->fs_info);
+       fs_info->num_tolerated_disk_barrier_failures =
+               btrfs_calc_num_tolerated_disk_barrier_failures(fs_info);
        ret = btrfs_commit_transaction(trans, root);
 
        if (seeding_dev) {
@@ -2490,7 +2492,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
 
                ret = btrfs_relocate_sys_chunks(root);
                if (ret < 0)
-                       btrfs_handle_fs_error(root->fs_info, ret,
+                       btrfs_handle_fs_error(fs_info, ret,
                                    "Failed to relocate sys chunks after device initialization. This can be fixed using the \"btrfs balance\" command.");
                trans = btrfs_attach_transaction(root);
                if (IS_ERR(trans)) {
@@ -2508,7 +2510,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
 error_trans:
        btrfs_end_transaction(trans, root);
        rcu_string_free(device->name);
-       btrfs_sysfs_rm_device_link(root->fs_info->fs_devices, device);
+       btrfs_sysfs_rm_device_link(fs_info->fs_devices, device);
        kfree(device);
 error:
        blkdev_put(bdev, FMODE_EXCL);
@@ -2584,12 +2586,12 @@ int btrfs_init_dev_replace_tgtdev(struct btrfs_root *root, char *device_path,
        q = bdev_get_queue(bdev);
        if (blk_queue_discard(q))
                device->can_discard = 1;
-       mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
        device->writeable = 1;
        device->generation = 0;
-       device->io_width = root->fs_info->sectorsize;
-       device->io_align = root->fs_info->sectorsize;
-       device->sector_size = root->fs_info->sectorsize;
+       device->io_width = fs_info->sectorsize;
+       device->io_align = fs_info->sectorsize;
+       device->sector_size = fs_info->sectorsize;
        device->total_bytes = btrfs_device_get_total_bytes(srcdev);
        device->disk_total_bytes = btrfs_device_get_disk_total_bytes(srcdev);
        device->bytes_used = btrfs_device_get_bytes_used(srcdev);
@@ -2607,7 +2609,7 @@ int btrfs_init_dev_replace_tgtdev(struct btrfs_root *root, char *device_path,
        list_add(&device->dev_list, &fs_info->fs_devices->devices);
        fs_info->fs_devices->num_devices++;
        fs_info->fs_devices->open_devices++;
-       mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
        *device_out = device;
        return ret;
@@ -2635,13 +2637,11 @@ static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,
 {
        int ret;
        struct btrfs_path *path;
-       struct btrfs_root *root;
+       struct btrfs_root *root = device->fs_info->chunk_root;
        struct btrfs_dev_item *dev_item;
        struct extent_buffer *leaf;
        struct btrfs_key key;
 
-       root = device->fs_info->chunk_root;
-
        path = btrfs_alloc_path();
        if (!path)
                return -ENOMEM;
@@ -2681,7 +2681,8 @@ static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,
 int btrfs_grow_device(struct btrfs_trans_handle *trans,
                      struct btrfs_device *device, u64 new_size)
 {
-       struct btrfs_super_block *super_copy = device->fs_info->super_copy;
+       struct btrfs_fs_info *fs_info = device->fs_info;
+       struct btrfs_super_block *super_copy = fs_info->super_copy;
        struct btrfs_fs_devices *fs_devices;
        u64 old_total;
        u64 diff;
@@ -2689,17 +2690,17 @@ int btrfs_grow_device(struct btrfs_trans_handle *trans,
        if (!device->writeable)
                return -EACCES;
 
-       lock_chunks(device->fs_info);
+       lock_chunks(fs_info);
        old_total = btrfs_super_total_bytes(super_copy);
        diff = new_size - device->total_bytes;
 
        if (new_size <= device->total_bytes ||
            device->is_tgtdev_for_dev_replace) {
-               unlock_chunks(device->fs_info);
+               unlock_chunks(fs_info);
                return -EINVAL;
        }
 
-       fs_devices = device->fs_info->fs_devices;
+       fs_devices = fs_info->fs_devices;
 
        btrfs_set_super_total_bytes(super_copy, old_total + diff);
        device->fs_devices->total_rw_bytes += diff;
@@ -2710,7 +2711,7 @@ int btrfs_grow_device(struct btrfs_trans_handle *trans,
        if (list_empty(&device->resized_list))
                list_add_tail(&device->resized_list,
                              &fs_devices->resized_devices);
-       unlock_chunks(device->fs_info);
+       unlock_chunks(fs_info);
 
        return btrfs_update_device(trans, device);
 }
@@ -2736,16 +2737,16 @@ static int btrfs_free_chunk(struct btrfs_trans_handle *trans,
        if (ret < 0)
                goto out;
        else if (ret > 0) { /* Logic error or corruption */
-               btrfs_handle_fs_error(root->fs_info, -ENOENT,
-                           "Failed lookup while freeing chunk.");
+               btrfs_handle_fs_error(fs_info, -ENOENT,
+                                     "Failed lookup while freeing chunk.");
                ret = -ENOENT;
                goto out;
        }
 
        ret = btrfs_del_item(trans, root, path);
        if (ret < 0)
-               btrfs_handle_fs_error(root->fs_info, ret,
-                           "Failed to delete chunk item.");
+               btrfs_handle_fs_error(fs_info, ret,
+                                     "Failed to delete chunk item.");
 out:
        btrfs_free_path(path);
        return ret;
@@ -2754,8 +2755,7 @@ static int btrfs_free_chunk(struct btrfs_trans_handle *trans,
 static int btrfs_del_sys_chunk(struct btrfs_fs_info *fs_info,
                               u64 chunk_objectid, u64 chunk_offset)
 {
-       struct btrfs_root *root = fs_info->chunk_root;
-       struct btrfs_super_block *super_copy = root->fs_info->super_copy;
+       struct btrfs_super_block *super_copy = fs_info->super_copy;
        struct btrfs_disk_key *disk_key;
        struct btrfs_chunk *chunk;
        u8 *ptr;
@@ -2766,7 +2766,7 @@ static int btrfs_del_sys_chunk(struct btrfs_fs_info *fs_info,
        u32 cur;
        struct btrfs_key key;
 
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
        array_size = btrfs_super_sys_array_size(super_copy);
 
        ptr = super_copy->sys_chunk_array;
@@ -2796,22 +2796,21 @@ static int btrfs_del_sys_chunk(struct btrfs_fs_info *fs_info,
                        cur += len;
                }
        }
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
        return ret;
 }
 
 int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
                       struct btrfs_fs_info *fs_info, u64 chunk_offset)
 {
-       struct btrfs_root *root = fs_info->chunk_root;
        struct extent_map_tree *em_tree;
        struct extent_map *em;
-       struct btrfs_root *extent_root = root->fs_info->extent_root;
+       struct btrfs_root *extent_root = fs_info->extent_root;
        struct map_lookup *map;
        u64 dev_extent_len = 0;
        u64 chunk_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
        int i, ret = 0;
-       struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
 
        em_tree = &fs_info->mapping_tree.map_tree;
 
@@ -2854,14 +2853,14 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
                }
 
                if (device->bytes_used > 0) {
-                       lock_chunks(root->fs_info);
+                       lock_chunks(fs_info);
                        btrfs_device_set_bytes_used(device,
                                        device->bytes_used - dev_extent_len);
-                       spin_lock(&root->fs_info->free_chunk_lock);
-                       root->fs_info->free_chunk_space += dev_extent_len;
-                       spin_unlock(&root->fs_info->free_chunk_lock);
-                       btrfs_clear_space_info_full(root->fs_info);
-                       unlock_chunks(root->fs_info);
+                       spin_lock(&fs_info->free_chunk_lock);
+                       fs_info->free_chunk_space += dev_extent_len;
+                       spin_unlock(&fs_info->free_chunk_lock);
+                       btrfs_clear_space_info_full(fs_info);
+                       unlock_chunks(fs_info);
                }
 
                if (map->stripes[i].dev) {
@@ -2875,8 +2874,7 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
        }
        mutex_unlock(&fs_devices->device_list_mutex);
 
-       ret = btrfs_free_chunk(trans, root->fs_info, chunk_objectid,
-                              chunk_offset);
+       ret = btrfs_free_chunk(trans, fs_info, chunk_objectid, chunk_offset);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                goto out;
@@ -2924,15 +2922,15 @@ static int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)
         * we release the path used to search the chunk/dev tree and before
         * the current task acquires this mutex and calls us.
         */
-       ASSERT(mutex_is_locked(&root->fs_info->delete_unused_bgs_mutex));
+       ASSERT(mutex_is_locked(&fs_info->delete_unused_bgs_mutex));
 
-       ret = btrfs_can_relocate(root->fs_info, chunk_offset);
+       ret = btrfs_can_relocate(fs_info, chunk_offset);
        if (ret)
                return -ENOSPC;
 
        /* step one, relocate all the extents inside this chunk */
        btrfs_scrub_pause(root);
-       ret = btrfs_relocate_block_group(root->fs_info, chunk_offset);
+       ret = btrfs_relocate_block_group(fs_info, chunk_offset);
        btrfs_scrub_continue(root);
        if (ret)
                return ret;
@@ -2956,7 +2954,8 @@ static int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)
 
 static int btrfs_relocate_sys_chunks(struct btrfs_root *root)
 {
-       struct btrfs_root *chunk_root = root->fs_info->chunk_root;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_root *chunk_root = fs_info->chunk_root;
        struct btrfs_path *path;
        struct extent_buffer *leaf;
        struct btrfs_chunk *chunk;
@@ -2977,10 +2976,10 @@ static int btrfs_relocate_sys_chunks(struct btrfs_root *root)
        key.type = BTRFS_CHUNK_ITEM_KEY;
 
        while (1) {
-               mutex_lock(&root->fs_info->delete_unused_bgs_mutex);
+               mutex_lock(&fs_info->delete_unused_bgs_mutex);
                ret = btrfs_search_slot(NULL, chunk_root, &key, path, 0, 0);
                if (ret < 0) {
-                       mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+                       mutex_unlock(&fs_info->delete_unused_bgs_mutex);
                        goto error;
                }
                BUG_ON(ret == 0); /* Corruption */
@@ -2988,7 +2987,7 @@ static int btrfs_relocate_sys_chunks(struct btrfs_root *root)
                ret = btrfs_previous_item(chunk_root, path, key.objectid,
                                          key.type);
                if (ret)
-                       mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+                       mutex_unlock(&fs_info->delete_unused_bgs_mutex);
                if (ret < 0)
                        goto error;
                if (ret > 0)
@@ -3003,14 +3002,13 @@ static int btrfs_relocate_sys_chunks(struct btrfs_root *root)
                btrfs_release_path(path);
 
                if (chunk_type & BTRFS_BLOCK_GROUP_SYSTEM) {
-                       ret = btrfs_relocate_chunk(root->fs_info,
-                                                  found_key.offset);
+                       ret = btrfs_relocate_chunk(fs_info, found_key.offset);
                        if (ret == -ENOSPC)
                                failed++;
                        else
                                BUG_ON(ret);
                }
-               mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+               mutex_unlock(&fs_info->delete_unused_bgs_mutex);
 
                if (found_key.offset == 0)
                        break;
@@ -3375,7 +3373,8 @@ static int should_balance_chunk(struct btrfs_root *root,
                                struct extent_buffer *leaf,
                                struct btrfs_chunk *chunk, u64 chunk_offset)
 {
-       struct btrfs_balance_control *bctl = root->fs_info->balance_ctl;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_balance_control *bctl = fs_info->balance_ctl;
        struct btrfs_balance_args *bargs = NULL;
        u64 chunk_type = btrfs_chunk_type(leaf, chunk);
 
@@ -3400,10 +3399,10 @@ static int should_balance_chunk(struct btrfs_root *root,
 
        /* usage filter */
        if ((bargs->flags & BTRFS_BALANCE_ARGS_USAGE) &&
-           chunk_usage_filter(bctl->fs_info, chunk_offset, bargs)) {
+           chunk_usage_filter(fs_info, chunk_offset, bargs)) {
                return 0;
        } else if ((bargs->flags & BTRFS_BALANCE_ARGS_USAGE_RANGE) &&
-           chunk_usage_range_filter(bctl->fs_info, chunk_offset, bargs)) {
+           chunk_usage_range_filter(fs_info, chunk_offset, bargs)) {
                return 0;
        }
 
@@ -4356,8 +4355,9 @@ int btrfs_check_uuid_tree(struct btrfs_fs_info *fs_info)
  */
 int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 {
+       struct btrfs_fs_info *fs_info = device->fs_info;
+       struct btrfs_root *root = fs_info->dev_root;
        struct btrfs_trans_handle *trans;
-       struct btrfs_root *root = device->fs_info->dev_root;
        struct btrfs_dev_extent *dev_extent = NULL;
        struct btrfs_path *path;
        u64 length;
@@ -4369,7 +4369,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
        bool checked_pending_chunks = false;
        struct extent_buffer *l;
        struct btrfs_key key;
-       struct btrfs_super_block *super_copy = root->fs_info->super_copy;
+       struct btrfs_super_block *super_copy = fs_info->super_copy;
        u64 old_total = btrfs_super_total_bytes(super_copy);
        u64 old_size = btrfs_device_get_total_bytes(device);
        u64 diff = old_size - new_size;
@@ -4383,16 +4383,16 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 
        path->reada = READA_FORWARD;
 
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
 
        btrfs_device_set_total_bytes(device, new_size);
        if (device->writeable) {
                device->fs_devices->total_rw_bytes -= diff;
-               spin_lock(&root->fs_info->free_chunk_lock);
-               root->fs_info->free_chunk_space -= diff;
-               spin_unlock(&root->fs_info->free_chunk_lock);
+               spin_lock(&fs_info->free_chunk_lock);
+               fs_info->free_chunk_space -= diff;
+               spin_unlock(&fs_info->free_chunk_lock);
        }
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
 
 again:
        key.objectid = device->devid;
@@ -4400,16 +4400,16 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
        key.type = BTRFS_DEV_EXTENT_KEY;
 
        do {
-               mutex_lock(&root->fs_info->delete_unused_bgs_mutex);
+               mutex_lock(&fs_info->delete_unused_bgs_mutex);
                ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
                if (ret < 0) {
-                       mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+                       mutex_unlock(&fs_info->delete_unused_bgs_mutex);
                        goto done;
                }
 
                ret = btrfs_previous_item(root, path, 0, key.type);
                if (ret)
-                       mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+                       mutex_unlock(&fs_info->delete_unused_bgs_mutex);
                if (ret < 0)
                        goto done;
                if (ret) {
@@ -4423,7 +4423,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
                btrfs_item_key_to_cpu(l, &key, path->slots[0]);
 
                if (key.objectid != device->devid) {
-                       mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+                       mutex_unlock(&fs_info->delete_unused_bgs_mutex);
                        btrfs_release_path(path);
                        break;
                }
@@ -4432,7 +4432,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
                length = btrfs_dev_extent_length(l, dev_extent);
 
                if (key.offset + length <= new_size) {
-                       mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+                       mutex_unlock(&fs_info->delete_unused_bgs_mutex);
                        btrfs_release_path(path);
                        break;
                }
@@ -4440,8 +4440,8 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
                chunk_offset = btrfs_dev_extent_chunk_offset(l, dev_extent);
                btrfs_release_path(path);
 
-               ret = btrfs_relocate_chunk(root->fs_info, chunk_offset);
-               mutex_unlock(&root->fs_info->delete_unused_bgs_mutex);
+               ret = btrfs_relocate_chunk(fs_info, chunk_offset);
+               mutex_unlock(&fs_info->delete_unused_bgs_mutex);
                if (ret && ret != -ENOSPC)
                        goto done;
                if (ret == -ENOSPC)
@@ -4464,7 +4464,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
                goto done;
        }
 
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
 
        /*
         * We checked in the above loop all device extents that were already in
@@ -4484,7 +4484,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 
                if (contains_pending_extent(trans->transaction, device,
                                            &start, len)) {
-                       unlock_chunks(root->fs_info);
+                       unlock_chunks(fs_info);
                        checked_pending_chunks = true;
                        failed = 0;
                        retried = false;
@@ -4498,11 +4498,11 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
        btrfs_device_set_disk_total_bytes(device, new_size);
        if (list_empty(&device->resized_list))
                list_add_tail(&device->resized_list,
-                             &root->fs_info->fs_devices->resized_devices);
+                             &fs_info->fs_devices->resized_devices);
 
        WARN_ON(diff > old_total);
        btrfs_set_super_total_bytes(super_copy, old_total - diff);
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
 
        /* Now btrfs_update_device() will change the on-disk size. */
        ret = btrfs_update_device(trans, device);
@@ -4510,14 +4510,14 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 done:
        btrfs_free_path(path);
        if (ret) {
-               lock_chunks(root->fs_info);
+               lock_chunks(fs_info);
                btrfs_device_set_total_bytes(device, old_size);
                if (device->writeable)
                        device->fs_devices->total_rw_bytes += diff;
-               spin_lock(&root->fs_info->free_chunk_lock);
-               root->fs_info->free_chunk_space += diff;
-               spin_unlock(&root->fs_info->free_chunk_lock);
-               unlock_chunks(root->fs_info);
+               spin_lock(&fs_info->free_chunk_lock);
+               fs_info->free_chunk_space += diff;
+               spin_unlock(&fs_info->free_chunk_lock);
+               unlock_chunks(fs_info);
        }
        return ret;
 }
@@ -4526,16 +4526,17 @@ static int btrfs_add_system_chunk(struct btrfs_root *root,
                           struct btrfs_key *key,
                           struct btrfs_chunk *chunk, int item_size)
 {
-       struct btrfs_super_block *super_copy = root->fs_info->super_copy;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_super_block *super_copy = fs_info->super_copy;
        struct btrfs_disk_key disk_key;
        u32 array_size;
        u8 *ptr;
 
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
        array_size = btrfs_super_sys_array_size(super_copy);
        if (array_size + item_size + sizeof(disk_key)
                        > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) {
-               unlock_chunks(root->fs_info);
+               unlock_chunks(fs_info);
                return -EFBIG;
        }
 
@@ -4546,7 +4547,7 @@ static int btrfs_add_system_chunk(struct btrfs_root *root,
        memcpy(ptr, chunk, item_size);
        item_size += sizeof(disk_key);
        btrfs_set_super_sys_array_size(super_copy, array_size + item_size);
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
 
        return 0;
 }
@@ -4838,7 +4839,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
        em->block_len = em->len;
        em->orig_block_len = stripe_size;
 
-       em_tree = &extent_root->fs_info->mapping_tree.map_tree;
+       em_tree = &info->mapping_tree.map_tree;
        write_lock(&em_tree->lock);
        ret = add_extent_mapping(em_tree, em, 0);
        if (!ret) {
@@ -4862,13 +4863,12 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
                btrfs_device_set_bytes_used(map->stripes[i].dev, num_bytes);
        }
 
-       spin_lock(&extent_root->fs_info->free_chunk_lock);
-       extent_root->fs_info->free_chunk_space -= (stripe_size *
-                                                  map->num_stripes);
-       spin_unlock(&extent_root->fs_info->free_chunk_lock);
+       spin_lock(&info->free_chunk_lock);
+       info->free_chunk_space -= (stripe_size * map->num_stripes);
+       spin_unlock(&info->free_chunk_lock);
 
        free_extent_map(em);
-       check_raid56_incompat_flag(extent_root->fs_info, type);
+       check_raid56_incompat_flag(info, type);
 
        kfree(devices_info);
        return 0;
@@ -4908,20 +4908,19 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
        int i = 0;
        int ret = 0;
 
-       em_tree = &extent_root->fs_info->mapping_tree.map_tree;
+       em_tree = &fs_info->mapping_tree.map_tree;
        read_lock(&em_tree->lock);
        em = lookup_extent_mapping(em_tree, chunk_offset, chunk_size);
        read_unlock(&em_tree->lock);
 
        if (!em) {
-               btrfs_crit(extent_root->fs_info,
-                          "unable to find logical %Lu len %Lu",
+               btrfs_crit(fs_info, "unable to find logical %Lu len %Lu",
                           chunk_offset, chunk_size);
                return -EINVAL;
        }
 
        if (em->start != chunk_offset || em->len != chunk_size) {
-               btrfs_crit(extent_root->fs_info,
+               btrfs_crit(fs_info,
                           "found a bad mapping, wanted %Lu-%Lu, found %Lu-%Lu",
                            chunk_offset, chunk_size, em->start, em->len);
                free_extent_map(em);
@@ -4945,7 +4944,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
         * at any time during that final phase of the device replace operation
         * (dev-replace.c:btrfs_dev_replace_finishing()).
         */
-       mutex_lock(&chunk_root->fs_info->fs_devices->device_list_mutex);
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
        for (i = 0; i < map->num_stripes; i++) {
                device = map->stripes[i].dev;
                dev_offset = map->stripes[i].physical;
@@ -4962,7 +4961,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
                        break;
        }
        if (ret) {
-               mutex_unlock(&chunk_root->fs_info->fs_devices->device_list_mutex);
+               mutex_unlock(&fs_info->fs_devices->device_list_mutex);
                goto out;
        }
 
@@ -4976,7 +4975,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
                memcpy(stripe->dev_uuid, device->uuid, BTRFS_UUID_SIZE);
                stripe++;
        }
-       mutex_unlock(&chunk_root->fs_info->fs_devices->device_list_mutex);
+       mutex_unlock(&fs_info->fs_devices->device_list_mutex);
 
        btrfs_set_stack_chunk_length(chunk, chunk_size);
        btrfs_set_stack_chunk_owner(chunk, extent_root->root_key.objectid);
@@ -4985,8 +4984,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
        btrfs_set_stack_chunk_num_stripes(chunk, map->num_stripes);
        btrfs_set_stack_chunk_io_align(chunk, map->stripe_len);
        btrfs_set_stack_chunk_io_width(chunk, map->stripe_len);
-       btrfs_set_stack_chunk_sector_size(chunk,
-                                         extent_root->fs_info->sectorsize);
+       btrfs_set_stack_chunk_sector_size(chunk, fs_info->sectorsize);
        btrfs_set_stack_chunk_sub_stripes(chunk, map->sub_stripes);
 
        key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
@@ -5019,10 +5017,11 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
 int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
                      struct btrfs_root *extent_root, u64 type)
 {
+       struct btrfs_fs_info *fs_info = extent_root->fs_info;
        u64 chunk_offset;
 
-       ASSERT(mutex_is_locked(&extent_root->fs_info->chunk_mutex));
-       chunk_offset = find_next_chunk(extent_root->fs_info);
+       ASSERT(mutex_is_locked(&fs_info->chunk_mutex));
+       chunk_offset = find_next_chunk(fs_info);
        return __btrfs_alloc_chunk(trans, extent_root, chunk_offset, type);
 }
 
@@ -5044,7 +5043,7 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans,
        if (ret)
                return ret;
 
-       sys_chunk_offset = find_next_chunk(root->fs_info);
+       sys_chunk_offset = find_next_chunk(fs_info);
        alloc_profile = btrfs_get_alloc_profile(fs_info->chunk_root, 0);
        ret = __btrfs_alloc_chunk(trans, extent_root, sys_chunk_offset,
                                  alloc_profile);
@@ -5071,9 +5070,10 @@ static inline int btrfs_chunk_max_errors(struct map_lookup *map)
 
 int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_map *em;
        struct map_lookup *map;
-       struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree;
+       struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree;
        int readonly = 0;
        int miss_ndevs = 0;
        int i;
@@ -5189,10 +5189,11 @@ unsigned long btrfs_full_stripe_len(struct btrfs_root *root,
                                    struct btrfs_mapping_tree *map_tree,
                                    u64 logical)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_map *em;
        struct map_lookup *map;
        struct extent_map_tree *em_tree = &map_tree->map_tree;
-       unsigned long len = root->fs_info->sectorsize;
+       unsigned long len = fs_info->sectorsize;
 
        read_lock(&em_tree->lock);
        em = lookup_extent_mapping(em_tree, logical, len);
@@ -6078,6 +6079,7 @@ static noinline void btrfs_schedule_bio(struct btrfs_root *root,
                                        struct btrfs_device *device,
                                        struct bio *bio)
 {
+       struct btrfs_fs_info *fs_info = device->fs_info;
        int should_queue = 1;
        struct btrfs_pending_bios *pending_bios;
 
@@ -6100,7 +6102,7 @@ static noinline void btrfs_schedule_bio(struct btrfs_root *root,
         * made progress against dirty pages when we've really just put it
         * on a queue for later
         */
-       atomic_inc(&root->fs_info->nr_async_bios);
+       atomic_inc(&fs_info->nr_async_bios);
        WARN_ON(bio->bi_next);
        bio->bi_next = NULL;
 
@@ -6122,8 +6124,7 @@ static noinline void btrfs_schedule_bio(struct btrfs_root *root,
        spin_unlock(&device->io_lock);
 
        if (should_queue)
-               btrfs_queue_work(root->fs_info->submit_workers,
-                                &device->work);
+               btrfs_queue_work(fs_info->submit_workers, &device->work);
 }
 
 static void submit_stripe_bio(struct btrfs_root *root, struct btrfs_bio *bbio,
@@ -6178,6 +6179,7 @@ static void bbio_error(struct btrfs_bio *bbio, struct bio *bio, u64 logical)
 int btrfs_map_bio(struct btrfs_root *root, struct bio *bio,
                  int mirror_num, int async_submit)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_device *dev;
        struct bio *first_bio = bio;
        u64 logical = (u64)bio->bi_iter.bi_sector << 9;
@@ -6191,11 +6193,11 @@ int btrfs_map_bio(struct btrfs_root *root, struct bio *bio,
        length = bio->bi_iter.bi_size;
        map_length = length;
 
-       btrfs_bio_counter_inc_blocked(root->fs_info);
-       ret = __btrfs_map_block(root->fs_info, bio_op(bio), logical,
+       btrfs_bio_counter_inc_blocked(fs_info);
+       ret = __btrfs_map_block(fs_info, bio_op(bio), logical,
                                &map_length, &bbio, mirror_num, 1);
        if (ret) {
-               btrfs_bio_counter_dec(root->fs_info);
+               btrfs_bio_counter_dec(fs_info);
                return ret;
        }
 
@@ -6203,7 +6205,7 @@ int btrfs_map_bio(struct btrfs_root *root, struct bio *bio,
        bbio->orig_bio = first_bio;
        bbio->private = first_bio->bi_private;
        bbio->end_io = first_bio->bi_end_io;
-       bbio->fs_info = root->fs_info;
+       bbio->fs_info = fs_info;
        atomic_set(&bbio->stripes_pending, bbio->num_stripes);
 
        if ((bbio->map_type & BTRFS_BLOCK_GROUP_RAID56_MASK) &&
@@ -6217,12 +6219,12 @@ int btrfs_map_bio(struct btrfs_root *root, struct bio *bio,
                                                    mirror_num, 1);
                }
 
-               btrfs_bio_counter_dec(root->fs_info);
+               btrfs_bio_counter_dec(fs_info);
                return ret;
        }
 
        if (map_length < length) {
-               btrfs_crit(root->fs_info,
+               btrfs_crit(fs_info,
                           "mapping failed logical %llu bio len %llu len %llu",
                           logical, length, map_length);
                BUG();
@@ -6246,7 +6248,7 @@ int btrfs_map_bio(struct btrfs_root *root, struct bio *bio,
                                  bbio->stripes[dev_nr].physical, dev_nr,
                                  async_submit);
        }
-       btrfs_bio_counter_dec(root->fs_info);
+       btrfs_bio_counter_dec(fs_info);
        return 0;
 }
 
@@ -6346,6 +6348,7 @@ static int btrfs_check_chunk_valid(struct btrfs_root *root,
                                   struct extent_buffer *leaf,
                                   struct btrfs_chunk *chunk, u64 logical)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        u64 length;
        u64 stripe_len;
        u16 num_stripes;
@@ -6359,33 +6362,31 @@ static int btrfs_check_chunk_valid(struct btrfs_root *root,
        type = btrfs_chunk_type(leaf, chunk);
 
        if (!num_stripes) {
-               btrfs_err(root->fs_info, "invalid chunk num_stripes: %u",
+               btrfs_err(fs_info, "invalid chunk num_stripes: %u",
                          num_stripes);
                return -EIO;
        }
-       if (!IS_ALIGNED(logical, root->fs_info->sectorsize)) {
-               btrfs_err(root->fs_info,
-                         "invalid chunk logical %llu", logical);
+       if (!IS_ALIGNED(logical, fs_info->sectorsize)) {
+               btrfs_err(fs_info, "invalid chunk logical %llu", logical);
                return -EIO;
        }
-       if (btrfs_chunk_sector_size(leaf, chunk) != root->fs_info->sectorsize) {
-               btrfs_err(root->fs_info, "invalid chunk sectorsize %u",
+       if (btrfs_chunk_sector_size(leaf, chunk) != fs_info->sectorsize) {
+               btrfs_err(fs_info, "invalid chunk sectorsize %u",
                          btrfs_chunk_sector_size(leaf, chunk));
                return -EIO;
        }
-       if (!length || !IS_ALIGNED(length, root->fs_info->sectorsize)) {
-               btrfs_err(root->fs_info,
-                       "invalid chunk length %llu", length);
+       if (!length || !IS_ALIGNED(length, fs_info->sectorsize)) {
+               btrfs_err(fs_info, "invalid chunk length %llu", length);
                return -EIO;
        }
        if (!is_power_of_2(stripe_len) || stripe_len != BTRFS_STRIPE_LEN) {
-               btrfs_err(root->fs_info, "invalid chunk stripe length: %llu",
+               btrfs_err(fs_info, "invalid chunk stripe length: %llu",
                          stripe_len);
                return -EIO;
        }
        if (~(BTRFS_BLOCK_GROUP_TYPE_MASK | BTRFS_BLOCK_GROUP_PROFILE_MASK) &
            type) {
-               btrfs_err(root->fs_info, "unrecognized chunk type: %llu",
+               btrfs_err(fs_info, "unrecognized chunk type: %llu",
                          ~(BTRFS_BLOCK_GROUP_TYPE_MASK |
                            BTRFS_BLOCK_GROUP_PROFILE_MASK) &
                          btrfs_chunk_type(leaf, chunk));
@@ -6398,7 +6399,7 @@ static int btrfs_check_chunk_valid(struct btrfs_root *root,
            (type & BTRFS_BLOCK_GROUP_DUP && num_stripes > 2) ||
            ((type & BTRFS_BLOCK_GROUP_PROFILE_MASK) == 0 &&
             num_stripes != 1)) {
-               btrfs_err(root->fs_info,
+               btrfs_err(fs_info,
                        "invalid num_stripes:sub_stripes %u:%u for profile %llu",
                        num_stripes, sub_stripes,
                        type & BTRFS_BLOCK_GROUP_PROFILE_MASK);
@@ -6412,7 +6413,8 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
                          struct extent_buffer *leaf,
                          struct btrfs_chunk *chunk)
 {
-       struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree;
        struct map_lookup *map;
        struct extent_map *em;
        u64 logical;
@@ -6476,23 +6478,22 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
                read_extent_buffer(leaf, uuid, (unsigned long)
                                   btrfs_stripe_dev_uuid_nr(chunk, i),
                                   BTRFS_UUID_SIZE);
-               map->stripes[i].dev = btrfs_find_device(root->fs_info, devid,
+               map->stripes[i].dev = btrfs_find_device(fs_info, devid,
                                                        uuid, NULL);
                if (!map->stripes[i].dev &&
-                   !btrfs_test_opt(root->fs_info, DEGRADED)) {
+                   !btrfs_test_opt(fs_info, DEGRADED)) {
                        free_extent_map(em);
                        return -EIO;
                }
                if (!map->stripes[i].dev) {
                        map->stripes[i].dev =
-                               add_missing_dev(root, root->fs_info->fs_devices,
+                               add_missing_dev(root, fs_info->fs_devices,
                                                devid, uuid);
                        if (!map->stripes[i].dev) {
                                free_extent_map(em);
                                return -EIO;
                        }
-                       btrfs_warn(root->fs_info,
-                                  "devid %llu uuid %pU is missing",
+                       btrfs_warn(fs_info, "devid %llu uuid %pU is missing",
                                   devid, uuid);
                }
                map->stripes[i].dev->in_fs_metadata = 1;
@@ -6533,12 +6534,13 @@ static void fill_device_from_item(struct extent_buffer *leaf,
 static struct btrfs_fs_devices *open_seed_devices(struct btrfs_root *root,
                                                  u8 *fsid)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_fs_devices *fs_devices;
        int ret;
 
        BUG_ON(!mutex_is_locked(&uuid_mutex));
 
-       fs_devices = root->fs_info->fs_devices->seed;
+       fs_devices = fs_info->fs_devices->seed;
        while (fs_devices) {
                if (!memcmp(fs_devices->fsid, fsid, BTRFS_UUID_SIZE))
                        return fs_devices;
@@ -6548,7 +6550,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_root *root,
 
        fs_devices = find_fsid(fsid);
        if (!fs_devices) {
-               if (!btrfs_test_opt(root->fs_info, DEGRADED))
+               if (!btrfs_test_opt(fs_info, DEGRADED))
                        return ERR_PTR(-ENOENT);
 
                fs_devices = alloc_fs_devices(fsid);
@@ -6565,7 +6567,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_root *root,
                return fs_devices;
 
        ret = __btrfs_open_devices(fs_devices, FMODE_READ,
-                                  root->fs_info->bdev_holder);
+                                  fs_info->bdev_holder);
        if (ret) {
                free_fs_devices(fs_devices);
                fs_devices = ERR_PTR(ret);
@@ -6579,8 +6581,8 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_root *root,
                goto out;
        }
 
-       fs_devices->seed = root->fs_info->fs_devices->seed;
-       root->fs_info->fs_devices->seed = fs_devices;
+       fs_devices->seed = fs_info->fs_devices->seed;
+       fs_info->fs_devices->seed = fs_devices;
 out:
        return fs_devices;
 }
@@ -6589,7 +6591,8 @@ static int read_one_dev(struct btrfs_root *root,
                        struct extent_buffer *leaf,
                        struct btrfs_dev_item *dev_item)
 {
-       struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
+       struct btrfs_fs_info *fs_info = root->fs_info;
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        struct btrfs_device *device;
        u64 devid;
        int ret;
@@ -6602,24 +6605,24 @@ static int read_one_dev(struct btrfs_root *root,
        read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item),
                           BTRFS_UUID_SIZE);
 
-       if (memcmp(fs_uuid, root->fs_info->fsid, BTRFS_UUID_SIZE)) {
+       if (memcmp(fs_uuid, fs_info->fsid, BTRFS_UUID_SIZE)) {
                fs_devices = open_seed_devices(root, fs_uuid);
                if (IS_ERR(fs_devices))
                        return PTR_ERR(fs_devices);
        }
 
-       device = btrfs_find_device(root->fs_info, devid, dev_uuid, fs_uuid);
+       device = btrfs_find_device(fs_info, devid, dev_uuid, fs_uuid);
        if (!device) {
-               if (!btrfs_test_opt(root->fs_info, DEGRADED))
+               if (!btrfs_test_opt(fs_info, DEGRADED))
                        return -EIO;
 
                device = add_missing_dev(root, fs_devices, devid, dev_uuid);
                if (!device)
                        return -ENOMEM;
-               btrfs_warn(root->fs_info, "devid %llu uuid %pU missing",
+               btrfs_warn(fs_info, "devid %llu uuid %pU missing",
                                devid, dev_uuid);
        } else {
-               if (!device->bdev && !btrfs_test_opt(root->fs_info, DEGRADED))
+               if (!device->bdev && !btrfs_test_opt(fs_info, DEGRADED))
                        return -EIO;
 
                if(!device->bdev && !device->missing) {
@@ -6648,7 +6651,7 @@ static int read_one_dev(struct btrfs_root *root,
                }
        }
 
-       if (device->fs_devices != root->fs_info->fs_devices) {
+       if (device->fs_devices != fs_info->fs_devices) {
                BUG_ON(device->writeable);
                if (device->generation !=
                    btrfs_device_generation(leaf, dev_item))
@@ -6659,10 +6662,10 @@ static int read_one_dev(struct btrfs_root *root,
        device->in_fs_metadata = 1;
        if (device->writeable && !device->is_tgtdev_for_dev_replace) {
                device->fs_devices->total_rw_bytes += device->total_bytes;
-               spin_lock(&root->fs_info->free_chunk_lock);
-               root->fs_info->free_chunk_space += device->total_bytes -
+               spin_lock(&fs_info->free_chunk_lock);
+               fs_info->free_chunk_space += device->total_bytes -
                        device->bytes_used;
-               spin_unlock(&root->fs_info->free_chunk_lock);
+               spin_unlock(&fs_info->free_chunk_lock);
        }
        ret = 0;
        return ret;
@@ -6685,7 +6688,7 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)
        u64 type;
        struct btrfs_key key;
 
-       ASSERT(BTRFS_SUPER_INFO_SIZE <= root->fs_info->nodesize);
+       ASSERT(BTRFS_SUPER_INFO_SIZE <= fs_info->nodesize);
        /*
         * This will create extent buffer of nodesize, superblock size is
         * fixed to BTRFS_SUPER_INFO_SIZE. If nodesize > sb size, this will
@@ -6804,7 +6807,7 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)
                return -ENOMEM;
 
        mutex_lock(&uuid_mutex);
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
 
        /*
         * Read all device items, and then all the chunk items. All
@@ -6852,26 +6855,26 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)
         * After loading chunk tree, we've got all device information,
         * do another round of validation checks.
         */
-       if (total_dev != root->fs_info->fs_devices->total_devices) {
-               btrfs_err(root->fs_info,
+       if (total_dev != fs_info->fs_devices->total_devices) {
+               btrfs_err(fs_info,
           "super_num_devices %llu mismatch with num_devices %llu found here",
-                         btrfs_super_num_devices(root->fs_info->super_copy),
+                         btrfs_super_num_devices(fs_info->super_copy),
                          total_dev);
                ret = -EINVAL;
                goto error;
        }
-       if (btrfs_super_total_bytes(root->fs_info->super_copy) <
-           root->fs_info->fs_devices->total_rw_bytes) {
-               btrfs_err(root->fs_info,
+       if (btrfs_super_total_bytes(fs_info->super_copy) <
+           fs_info->fs_devices->total_rw_bytes) {
+               btrfs_err(fs_info,
        "super_total_bytes %llu mismatch with fs_devices total_rw_bytes %llu",
-                         btrfs_super_total_bytes(root->fs_info->super_copy),
-                         root->fs_info->fs_devices->total_rw_bytes);
+                         btrfs_super_total_bytes(fs_info->super_copy),
+                         fs_info->fs_devices->total_rw_bytes);
                ret = -EINVAL;
                goto error;
        }
        ret = 0;
 error:
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
        mutex_unlock(&uuid_mutex);
 
        btrfs_free_path(path);
@@ -6982,7 +6985,7 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,
        BUG_ON(!path);
        ret = btrfs_search_slot(trans, dev_root, &key, path, -1, 1);
        if (ret < 0) {
-               btrfs_warn_in_rcu(dev_root->fs_info,
+               btrfs_warn_in_rcu(fs_info,
                        "error %d while searching for dev_stats item for device %s",
                              ret, rcu_str_deref(device->name));
                goto out;
@@ -6993,7 +6996,7 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,
                /* need to delete old one and insert a new one */
                ret = btrfs_del_item(trans, dev_root, path);
                if (ret != 0) {
-                       btrfs_warn_in_rcu(dev_root->fs_info,
+                       btrfs_warn_in_rcu(fs_info,
                                "delete too small dev_stats item for device %s failed %d",
                                      rcu_str_deref(device->name), ret);
                        goto out;
@@ -7007,7 +7010,7 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,
                ret = btrfs_insert_empty_item(trans, dev_root, path,
                                              &key, sizeof(*ptr));
                if (ret < 0) {
-                       btrfs_warn_in_rcu(dev_root->fs_info,
+                       btrfs_warn_in_rcu(fs_info,
                                "insert dev_stats item for device %s failed %d",
                                rcu_str_deref(device->name), ret);
                        goto out;
@@ -7095,21 +7098,20 @@ static void btrfs_dev_stat_print_on_load(struct btrfs_device *dev)
 int btrfs_get_dev_stats(struct btrfs_root *root,
                        struct btrfs_ioctl_get_dev_stats *stats)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_device *dev;
-       struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
+       struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
        int i;
 
        mutex_lock(&fs_devices->device_list_mutex);
-       dev = btrfs_find_device(root->fs_info, stats->devid, NULL, NULL);
+       dev = btrfs_find_device(fs_info, stats->devid, NULL, NULL);
        mutex_unlock(&fs_devices->device_list_mutex);
 
        if (!dev) {
-               btrfs_warn(root->fs_info,
-                          "get dev_stats failed, device not found");
+               btrfs_warn(fs_info, "get dev_stats failed, device not found");
                return -ENODEV;
        } else if (!dev->dev_stats_valid) {
-               btrfs_warn(root->fs_info,
-                          "get dev_stats failed, not yet valid");
+               btrfs_warn(fs_info, "get dev_stats failed, not yet valid");
                return -ENODEV;
        } else if (stats->flags & BTRFS_DEV_STATS_RESET) {
                for (i = 0; i < BTRFS_DEV_STAT_VALUES_MAX; i++) {
@@ -7186,6 +7188,7 @@ void btrfs_update_commit_device_size(struct btrfs_fs_info *fs_info)
 void btrfs_update_commit_device_bytes_used(struct btrfs_root *root,
                                        struct btrfs_transaction *transaction)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct extent_map *em;
        struct map_lookup *map;
        struct btrfs_device *dev;
@@ -7195,7 +7198,7 @@ void btrfs_update_commit_device_bytes_used(struct btrfs_root *root,
                return;
 
        /* In order to kick the device replace finish process */
-       lock_chunks(root->fs_info);
+       lock_chunks(fs_info);
        list_for_each_entry(em, &transaction->pending_chunks, list) {
                map = em->map_lookup;
 
@@ -7204,7 +7207,7 @@ void btrfs_update_commit_device_bytes_used(struct btrfs_root *root,
                        dev->commit_bytes_used = dev->bytes_used;
                }
        }
-       unlock_chunks(root->fs_info);
+       unlock_chunks(fs_info);
 }
 
 void btrfs_set_fs_info_ptr(struct btrfs_fs_info *fs_info)