btrfs-progs: Refactor parameter of BTRFS_MAX_DEVS() from root to fs_info
authorQu Wenruo <wqu@suse.com>
Fri, 9 Feb 2018 07:44:19 +0000 (15:44 +0800)
committerDavid Sterba <dsterba@suse.com>
Sat, 24 Feb 2018 00:37:17 +0000 (01:37 +0100)
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
volumes.c

index edad367..677d085 100644 (file)
--- a/volumes.c
+++ b/volumes.c
@@ -826,7 +826,7 @@ error:
        return ret;
 }
 
-#define BTRFS_MAX_DEVS(r) ((BTRFS_LEAF_DATA_SIZE(r->fs_info)   \
+#define BTRFS_MAX_DEVS(info) ((BTRFS_LEAF_DATA_SIZE(info)      \
                        - sizeof(struct btrfs_item)             \
                        - sizeof(struct btrfs_chunk))           \
                        / sizeof(struct btrfs_stripe) + 1)
@@ -882,12 +882,12 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
                        calc_size = SZ_1G;
                        max_chunk_size = 10 * calc_size;
                        min_stripe_size = SZ_64M;
-                       max_stripes = BTRFS_MAX_DEVS(chunk_root);
+                       max_stripes = BTRFS_MAX_DEVS(info);
                } else if (type & BTRFS_BLOCK_GROUP_METADATA) {
                        calc_size = SZ_1G;
                        max_chunk_size = 4 * calc_size;
                        min_stripe_size = SZ_32M;
-                       max_stripes = BTRFS_MAX_DEVS(chunk_root);
+                       max_stripes = BTRFS_MAX_DEVS(info);
                }
        }
        if (type & BTRFS_BLOCK_GROUP_RAID1) {