btrfs: pull node/sector/stripe sizes out of root and into fs_info

We track the node sizes per-root, but they never vary from the values
in the superblock.  This patch messes with the 80-column style a bit,
but subsequent patches to factor out root->fs_info into a convenience
variable fix it up again.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 91f6bd9124d9..a6243ccd9800 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2911,14 +2911,14 @@ int btrfsic_mount(struct btrfs_root *root,
         struct list_head *dev_head = &fs_devices->devices;
         struct btrfs_device *device;
 
-        if (root->nodesize & ((u64)PAGE_SIZE - 1)) {
+        if (root->fs_info->nodesize & ((u64)PAGE_SIZE - 1)) {
                 pr_info("btrfsic: cannot handle nodesize %d not being a multiple of PAGE_SIZE %ld!\n",
-                       root->nodesize, PAGE_SIZE);
+                       root->fs_info->nodesize, PAGE_SIZE);
                 return -1;
         }
-        if (root->sectorsize & ((u64)PAGE_SIZE - 1)) {
+        if (root->fs_info->sectorsize & ((u64)PAGE_SIZE - 1)) {
                 pr_info("btrfsic: cannot handle sectorsize %d not being a multiple of PAGE_SIZE %ld!\n",
-                       root->sectorsize, PAGE_SIZE);
+                       root->fs_info->sectorsize, PAGE_SIZE);
                 return -1;
         }
         state = kzalloc(sizeof(*state), GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
@@ -2940,8 +2940,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->nodesize;
-        state->datablock_size = root->sectorsize;
+        state->metablock_size = root->fs_info->nodesize;
+        state->datablock_size = root->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);