summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--btrfs-zero-log.c4
-rw-r--r--btrfstune.c4
-rw-r--r--cmds-check.c4
-rw-r--r--convert.c16
-rw-r--r--ctree.h2
-rw-r--r--debug-tree.c8
-rw-r--r--disk-io.c46
-rw-r--r--extent-tree.c8
-rw-r--r--file-item.c8
-rw-r--r--find-root.c16
-rw-r--r--mkfs.c12
-rw-r--r--utils.c10
-rw-r--r--volumes.c20
13 files changed, 81 insertions, 77 deletions
diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c
index 1ea867bc..f249aec4 100644
--- a/btrfs-zero-log.c
+++ b/btrfs-zero-log.c
@@ -64,8 +64,8 @@ int main(int ac, char **av)
return 1;
trans = btrfs_start_transaction(root, 1);
- btrfs_set_super_log_root(&root->fs_info->super_copy, 0);
- btrfs_set_super_log_root_level(&root->fs_info->super_copy, 0);
+ btrfs_set_super_log_root(root->fs_info->super_copy, 0);
+ btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
btrfs_commit_transaction(trans, root);
close_ctree(root);
return ret;
diff --git a/btrfstune.c b/btrfstune.c
index 6e68bda9..2f3d0876 100644
--- a/btrfstune.c
+++ b/btrfstune.c
@@ -40,7 +40,7 @@ int update_seeding_flag(struct btrfs_root *root, int set_flag)
struct btrfs_super_block *disk_super;
u64 super_flags;
- disk_super = &root->fs_info->super_copy;
+ disk_super = root->fs_info->super_copy;
super_flags = btrfs_super_flags(disk_super);
if (set_flag) {
if (super_flags & BTRFS_SUPER_FLAG_SEEDING) {
@@ -71,7 +71,7 @@ int enable_extrefs_flag(struct btrfs_root *root)
struct btrfs_super_block *disk_super;
u64 super_flags;
- disk_super = &root->fs_info->super_copy;
+ disk_super = root->fs_info->super_copy;
super_flags = btrfs_super_incompat_flags(disk_super);
super_flags |= BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF;
trans = btrfs_start_transaction(root, 1);
diff --git a/cmds-check.c b/cmds-check.c
index 5d2e9edf..12192fa2 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -973,7 +973,7 @@ static u64 count_csum_range(struct btrfs_root *root, u64 start, u64 len)
size_t size;
u64 found = 0;
u64 csum_end;
- u16 csum_size = btrfs_super_csum_size(&root->fs_info->super_copy);
+ u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
btrfs_init_path(&path);
@@ -3613,7 +3613,7 @@ int cmd_check(int argc, char **argv)
if (info == NULL)
return 1;
- uuid_unparse(info->super_copy.fsid, uuidbuf);
+ uuid_unparse(info->super_copy->fsid, uuidbuf);
printf("Checking filesystem on %s\nUUID: %s\n", argv[optind], uuidbuf);
if (!extent_buffer_uptodate(info->tree_root->node) ||
diff --git a/convert.c b/convert.c
index 76a1076f..f462597f 100644
--- a/convert.c
+++ b/convert.c
@@ -1261,7 +1261,7 @@ static int create_ext2_image(struct btrfs_root *root, ext2_filsys ext2_fs,
u64 total_bytes;
u32 sectorsize = root->sectorsize;
- total_bytes = btrfs_super_total_bytes(&fs_info->super_copy);
+ total_bytes = btrfs_super_total_bytes(fs_info->super_copy);
first_free = BTRFS_SUPER_INFO_OFFSET + sectorsize * 2 - 1;
first_free &= ~((u64)sectorsize - 1);
@@ -1527,7 +1527,7 @@ static int create_chunk_mapping(struct btrfs_trans_handle *trans,
btrfs_init_path(&path);
- total_bytes = btrfs_super_total_bytes(&root->fs_info->super_copy);
+ total_bytes = btrfs_super_total_bytes(root->fs_info->super_copy);
chunk_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
BUG_ON(list_empty(&info->fs_devices->devices));
@@ -1691,13 +1691,13 @@ static int init_btrfs(struct btrfs_root *root)
memcpy(&location, &root->root_key, sizeof(location));
location.offset = (u64)-1;
ret = btrfs_insert_dir_item(trans, fs_info->tree_root, "default", 7,
- btrfs_super_root_dir(&fs_info->super_copy),
+ btrfs_super_root_dir(fs_info->super_copy),
&location, BTRFS_FT_DIR, 0);
if (ret)
goto err;
ret = btrfs_insert_inode_ref(trans, fs_info->tree_root, "default", 7,
location.objectid,
- btrfs_super_root_dir(&fs_info->super_copy), 0);
+ btrfs_super_root_dir(fs_info->super_copy), 0);
if (ret)
goto err;
btrfs_set_root_dirid(&fs_info->fs_root->root_item,
@@ -2227,7 +2227,7 @@ static int fixup_chunk_mapping(struct btrfs_root *root)
btrfs_release_path(chunk_root, &path);
/* fixup the system chunk array in super block */
- btrfs_set_super_sys_array_size(&info->super_copy, 0);
+ btrfs_set_super_sys_array_size(info->super_copy, 0);
key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
key.offset = 0;
@@ -2425,11 +2425,11 @@ static int may_rollback(struct btrfs_root *root)
int num_stripes;
int ret;
- if (btrfs_super_num_devices(&info->super_copy) != 1)
+ if (btrfs_super_num_devices(info->super_copy) != 1)
goto fail;
bytenr = BTRFS_SUPER_INFO_OFFSET;
- total_bytes = btrfs_super_total_bytes(&root->fs_info->super_copy);
+ total_bytes = btrfs_super_total_bytes(root->fs_info->super_copy);
while (1) {
ret = btrfs_map_block(&info->mapping_tree, WRITE, bytenr,
@@ -2659,7 +2659,7 @@ next_extent:
goto fail;
}
/* create a system chunk that maps the whole device */
- ret = prepare_system_chunk_sb(&root->fs_info->super_copy);
+ ret = prepare_system_chunk_sb(root->fs_info->super_copy);
if (ret) {
fprintf(stderr, "unable to update system chunk\n");
goto fail;
diff --git a/ctree.h b/ctree.h
index 0aed2fcb..9442e037 100644
--- a/ctree.h
+++ b/ctree.h
@@ -923,7 +923,7 @@ struct btrfs_fs_info {
u64 alloc_start;
struct btrfs_trans_handle *running_transaction;
- struct btrfs_super_block super_copy;
+ struct btrfs_super_block *super_copy;
struct mutex fs_mutex;
u64 super_bytenr;
diff --git a/debug-tree.c b/debug-tree.c
index 02b03899..0fc0ecdf 100644
--- a/debug-tree.c
+++ b/debug-tree.c
@@ -372,14 +372,14 @@ no_node:
return 0;
if (root_backups)
- print_old_roots(&info->super_copy);
+ print_old_roots(info->super_copy);
printf("total bytes %llu\n",
- (unsigned long long)btrfs_super_total_bytes(&info->super_copy));
+ (unsigned long long)btrfs_super_total_bytes(info->super_copy));
printf("bytes used %llu\n",
- (unsigned long long)btrfs_super_bytes_used(&info->super_copy));
+ (unsigned long long)btrfs_super_bytes_used(info->super_copy));
uuidbuf[36] = '\0';
- uuid_unparse(info->super_copy.fsid, uuidbuf);
+ uuid_unparse(info->super_copy->fsid, uuidbuf);
printf("uuid %s\n", uuidbuf);
printf("%s\n", BTRFS_BUILD_VERSION);
return 0;
diff --git a/disk-io.c b/disk-io.c
index 97fbfbd5..a9fd3749 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -106,7 +106,7 @@ int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
int verify)
{
u16 csum_size =
- btrfs_super_csum_size(&root->fs_info->super_copy);
+ btrfs_super_csum_size(root->fs_info->super_copy);
return csum_tree_block_size(buf, csum_size, verify);
}
@@ -840,6 +840,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
}
memset(fs_info, 0, sizeof(*fs_info));
+ fs_info->super_copy = calloc(1, BTRFS_SUPER_INFO_SIZE);
fs_info->tree_root = tree_root;
fs_info->extent_root = extent_root;
fs_info->chunk_root = chunk_root;
@@ -875,7 +876,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
goto out_cleanup;
fs_info->super_bytenr = sb_bytenr;
- disk_super = &fs_info->super_copy;
+ disk_super = fs_info->super_copy;
ret = btrfs_read_dev_super(fs_devices->latest_bdev,
disk_super, sb_bytenr);
if (ret) {
@@ -1164,10 +1165,6 @@ int write_dev_supers(struct btrfs_root *root, struct btrfs_super_block *sb,
u64 bytenr;
u32 crc;
int i, ret;
- void *buf;
-
- buf = calloc(1, BTRFS_SUPER_INFO_SIZE);
- BUG_ON(!buf);
if (root->fs_info->super_bytenr != BTRFS_SUPER_INFO_OFFSET) {
btrfs_set_super_bytenr(sb, root->fs_info->super_bytenr);
@@ -1176,11 +1173,15 @@ int write_dev_supers(struct btrfs_root *root, struct btrfs_super_block *sb,
BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
btrfs_csum_final(crc, (char *)&sb->csum[0]);
- memcpy(buf, sb, sizeof(*sb));
- ret = pwrite64(device->fd, buf, BTRFS_SUPER_INFO_SIZE,
- root->fs_info->super_bytenr);
+ /*
+ * super_copy is BTRFS_SUPER_INFO_SIZE bytes and is
+ * zero filled, we can use it directly
+ */
+ ret = pwrite64(device->fd, root->fs_info->super_copy,
+ BTRFS_SUPER_INFO_SIZE,
+ root->fs_info->super_bytenr);
BUG_ON(ret != BTRFS_SUPER_INFO_SIZE);
- goto out;
+ return 0;
}
for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
@@ -1195,12 +1196,15 @@ int write_dev_supers(struct btrfs_root *root, struct btrfs_super_block *sb,
BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
btrfs_csum_final(crc, (char *)&sb->csum[0]);
- memcpy(buf, sb, sizeof(*sb));
- ret = pwrite64(device->fd, buf, BTRFS_SUPER_INFO_SIZE, bytenr);
+ /*
+ * super_copy is BTRFS_SUPER_INFO_SIZE bytes and is
+ * zero filled, we can use it directly
+ */
+ ret = pwrite64(device->fd, root->fs_info->super_copy,
+ BTRFS_SUPER_INFO_SIZE, bytenr);
BUG_ON(ret != BTRFS_SUPER_INFO_SIZE);
}
-out:
- free(buf);
+
return 0;
}
@@ -1214,7 +1218,7 @@ int write_all_supers(struct btrfs_root *root)
int ret;
u64 flags;
- sb = &root->fs_info->super_copy;
+ sb = root->fs_info->super_copy;
dev_item = &sb->dev_item;
list_for_each(cur, head) {
dev = list_entry(cur, struct btrfs_device, dev_list);
@@ -1251,17 +1255,17 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
if (root->fs_info->readonly)
return 0;
- btrfs_set_super_generation(&root->fs_info->super_copy,
+ btrfs_set_super_generation(root->fs_info->super_copy,
trans->transid);
- btrfs_set_super_root(&root->fs_info->super_copy,
+ btrfs_set_super_root(root->fs_info->super_copy,
tree_root->node->start);
- btrfs_set_super_root_level(&root->fs_info->super_copy,
+ btrfs_set_super_root_level(root->fs_info->super_copy,
btrfs_header_level(tree_root->node));
- btrfs_set_super_chunk_root(&root->fs_info->super_copy,
+ btrfs_set_super_chunk_root(root->fs_info->super_copy,
chunk_root->node->start);
- btrfs_set_super_chunk_root_level(&root->fs_info->super_copy,
+ btrfs_set_super_chunk_root_level(root->fs_info->super_copy,
btrfs_header_level(chunk_root->node));
- btrfs_set_super_chunk_root_generation(&root->fs_info->super_copy,
+ btrfs_set_super_chunk_root_generation(root->fs_info->super_copy,
btrfs_header_generation(chunk_root->node));
ret = write_all_supers(root);
diff --git a/extent-tree.c b/extent-tree.c
index 85f5670d..da93cb17 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -1830,12 +1830,12 @@ static int update_block_group(struct btrfs_trans_handle *trans,
u64 end;
/* block accounting for super block */
- old_val = btrfs_super_bytes_used(&info->super_copy);
+ old_val = btrfs_super_bytes_used(info->super_copy);
if (alloc)
old_val += num_bytes;
else
old_val -= num_bytes;
- btrfs_set_super_bytes_used(&info->super_copy, old_val);
+ btrfs_set_super_bytes_used(info->super_copy, old_val);
/* block accounting for root item */
old_val = btrfs_root_used(&root->root_item);
@@ -3216,7 +3216,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
extent_root = root->fs_info->extent_root;
block_group_cache = &root->fs_info->block_group_cache;
chunk_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
- total_bytes = btrfs_super_total_bytes(&root->fs_info->super_copy);
+ total_bytes = btrfs_super_total_bytes(root->fs_info->super_copy);
group_align = 64 * root->sectorsize;
cur_start = 0;
@@ -3451,7 +3451,7 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
}
path.slots[0]++;
}
- btrfs_set_super_bytes_used(&root->fs_info->super_copy, bytes_used);
+ btrfs_set_super_bytes_used(root->fs_info->super_copy, bytes_used);
btrfs_release_path(root, &path);
return 0;
}
diff --git a/file-item.c b/file-item.c
index c746b44b..9c787f06 100644
--- a/file-item.c
+++ b/file-item.c
@@ -134,7 +134,7 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf;
u64 csum_offset = 0;
u16 csum_size =
- btrfs_super_csum_size(&root->fs_info->super_copy);
+ btrfs_super_csum_size(root->fs_info->super_copy);
int csums_in_item;
file_key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
@@ -206,7 +206,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
u32 nritems;
u32 ins_size;
u16 csum_size =
- btrfs_super_csum_size(&root->fs_info->super_copy);
+ btrfs_super_csum_size(root->fs_info->super_copy);
path = btrfs_alloc_path();
BUG_ON(!path);
@@ -352,7 +352,7 @@ static noinline int truncate_one_csum(struct btrfs_trans_handle *trans,
{
struct extent_buffer *leaf;
u16 csum_size =
- btrfs_super_csum_size(&root->fs_info->super_copy);
+ btrfs_super_csum_size(root->fs_info->super_copy);
u64 csum_end;
u64 end_byte = bytenr + len;
u32 blocksize = root->sectorsize;
@@ -411,7 +411,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf;
int ret;
u16 csum_size =
- btrfs_super_csum_size(&root->fs_info->super_copy);
+ btrfs_super_csum_size(root->fs_info->super_copy);
int blocksize = root->sectorsize;
root = root->fs_info->csum_root;
diff --git a/find-root.c b/find-root.c
index 20ff9721..f99fb76f 100644
--- a/find-root.c
+++ b/find-root.c
@@ -147,7 +147,7 @@ static struct btrfs_root *open_ctree_broken(int fd, const char *device)
goto out_cleanup;
fs_info->super_bytenr = BTRFS_SUPER_INFO_OFFSET;
- disk_super = &fs_info->super_copy;
+ disk_super = fs_info->super_copy;
ret = btrfs_read_dev_super(fs_devices->latest_bdev,
disk_super, BTRFS_SUPER_INFO_OFFSET);
if (ret) {
@@ -234,10 +234,10 @@ out:
static int search_iobuf(struct btrfs_root *root, void *iobuf,
size_t iobuf_size, off_t offset)
{
- u64 gen = btrfs_super_generation(&root->fs_info->super_copy);
+ u64 gen = btrfs_super_generation(root->fs_info->super_copy);
u64 objectid = search_objectid;
- u32 size = btrfs_super_nodesize(&root->fs_info->super_copy);
- u8 level = root->fs_info->super_copy.root_level;
+ u32 size = btrfs_super_nodesize(root->fs_info->super_copy);
+ u8 level = root->fs_info->super_copy->root_level;
size_t block_off = 0;
while (block_off < iobuf_size) {
@@ -322,8 +322,8 @@ static int find_root(struct btrfs_root *root)
int ret = 1;
printf("Super think's the tree root is at %Lu, chunk root %Lu\n",
- btrfs_super_root(&root->fs_info->super_copy),
- btrfs_super_chunk_root(&root->fs_info->super_copy));
+ btrfs_super_root(root->fs_info->super_copy),
+ btrfs_super_chunk_root(root->fs_info->super_copy));
err = btrfs_next_metadata(&root->fs_info->mapping_tree,
&metadata_offset, &metadata_size);
@@ -336,7 +336,7 @@ static int find_root(struct btrfs_root *root)
u64 type;
if (offset >
- btrfs_super_total_bytes(&root->fs_info->super_copy)) {
+ btrfs_super_total_bytes(root->fs_info->super_copy)) {
printf("Went past the fs size, exiting");
break;
}
@@ -426,7 +426,7 @@ int main(int argc, char **argv)
exit(1);
}
- csum_size = btrfs_super_csum_size(&root->fs_info->super_copy);
+ csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
ret = find_root(root);
close_ctree(root);
return ret;
diff --git a/mkfs.c b/mkfs.c
index f9f26a57..b2520cee 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -67,7 +67,7 @@ static int make_root_dir(struct btrfs_root *root, int mixed)
int ret;
trans = btrfs_start_transaction(root, 1);
- bytes_used = btrfs_super_bytes_used(&root->fs_info->super_copy);
+ bytes_used = btrfs_super_bytes_used(root->fs_info->super_copy);
root->fs_info->system_allocs = 1;
ret = btrfs_make_block_group(trans, root, bytes_used,
@@ -129,7 +129,7 @@ static int make_root_dir(struct btrfs_root *root, int mixed)
location.offset = (u64)-1;
ret = btrfs_insert_dir_item(trans, root->fs_info->tree_root,
"default", 7,
- btrfs_super_root_dir(&root->fs_info->super_copy),
+ btrfs_super_root_dir(root->fs_info->super_copy),
&location, BTRFS_FT_DIR, 0);
if (ret)
goto err;
@@ -208,7 +208,7 @@ static int create_raid_groups(struct btrfs_trans_handle *trans,
int data_profile_opt, u64 metadata_profile,
int metadata_profile_opt, int mixed, int ssd)
{
- u64 num_devices = btrfs_super_num_devices(&root->fs_info->super_copy);
+ u64 num_devices = btrfs_super_num_devices(root->fs_info->super_copy);
u64 allowed = 0;
u64 devices_for_raid = num_devices;
int ret;
@@ -1650,7 +1650,7 @@ raid_groups:
ret = create_data_reloc_tree(trans, root);
BUG_ON(ret);
- super = &root->fs_info->super_copy;
+ super = root->fs_info->super_copy;
flags = btrfs_super_incompat_flags(super);
flags |= BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF;
@@ -1661,7 +1661,7 @@ raid_groups:
if ((data_profile | metadata_profile) &
(BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6)) {
- struct btrfs_super_block *super = &root->fs_info->super_copy;
+ struct btrfs_super_block *super = root->fs_info->super_copy;
u64 flags = btrfs_super_incompat_flags(super);
flags |= BTRFS_FEATURE_INCOMPAT_RAID56;
@@ -1672,7 +1672,7 @@ raid_groups:
printf("fs created label %s on %s\n\tnodesize %u leafsize %u "
"sectorsize %u size %s\n",
label, first_file, nodesize, leafsize, sectorsize,
- pretty_buf = pretty_sizes(btrfs_super_total_bytes(&root->fs_info->super_copy)));
+ pretty_buf = pretty_sizes(btrfs_super_total_bytes(root->fs_info->super_copy)));
free(pretty_buf);
printf("%s\n", BTRFS_BUILD_VERSION);
diff --git a/utils.c b/utils.c
index 629b40b4..f68436d0 100644
--- a/utils.c
+++ b/utils.c
@@ -473,7 +473,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
u32 sectorsize)
{
struct btrfs_super_block *disk_super;
- struct btrfs_super_block *super = &root->fs_info->super_copy;
+ struct btrfs_super_block *super = root->fs_info->super_copy;
struct btrfs_device *device;
struct btrfs_dev_item *dev_item;
char *buf;
@@ -624,7 +624,7 @@ int btrfs_make_root_dir(struct btrfs_trans_handle *trans,
btrfs_set_stack_timespec_nsec(&inode_item.otime, 0);
if (root->fs_info->tree_root == root)
- btrfs_set_super_root_dir(&root->fs_info->super_copy, objectid);
+ btrfs_set_super_root_dir(root->fs_info->super_copy, objectid);
ret = btrfs_insert_inode(trans, root, objectid, &inode_item);
if (ret)
@@ -1088,7 +1088,7 @@ int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
if (disk_super->magic != cpu_to_le64(BTRFS_MAGIC))
goto brelse;
- if (!memcmp(disk_super->fsid, root->fs_info->super_copy.fsid,
+ if (!memcmp(disk_super->fsid, root->fs_info->super_copy->fsid,
BTRFS_FSID_SIZE))
ret = 1;
brelse:
@@ -1191,7 +1191,7 @@ static int set_label_unmounted(const char *dev, const char *label)
return -1;
trans = btrfs_start_transaction(root, 1);
- snprintf(root->fs_info->super_copy.label, BTRFS_LABEL_SIZE, "%s",
+ snprintf(root->fs_info->super_copy->label, BTRFS_LABEL_SIZE, "%s",
label);
btrfs_commit_transaction(trans, root);
@@ -1243,7 +1243,7 @@ static int get_label_unmounted(const char *dev)
if(!root)
return -1;
- fprintf(stdout, "%s\n", root->fs_info->super_copy.label);
+ fprintf(stdout, "%s\n", root->fs_info->super_copy->label);
/* Now we close it since we are done. */
close_ctree(root);
diff --git a/volumes.c b/volumes.c
index c0d02d13..3e52d064 100644
--- a/volumes.c
+++ b/volumes.c
@@ -604,7 +604,7 @@ int btrfs_add_system_chunk(struct btrfs_trans_handle *trans,
struct btrfs_key *key,
struct btrfs_chunk *chunk, int item_size)
{
- struct btrfs_super_block *super_copy = &root->fs_info->super_copy;
+ struct btrfs_super_block *super_copy = root->fs_info->super_copy;
struct btrfs_disk_key disk_key;
u32 array_size;
u8 *ptr;
@@ -708,7 +708,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
}
if (type & BTRFS_BLOCK_GROUP_RAID1) {
num_stripes = min_t(u64, 2,
- btrfs_super_num_devices(&info->super_copy));
+ btrfs_super_num_devices(info->super_copy));
if (num_stripes < 2)
return -ENOSPC;
min_stripes = 2;
@@ -718,11 +718,11 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID0)) {
- num_stripes = btrfs_super_num_devices(&info->super_copy);
+ num_stripes = btrfs_super_num_devices(info->super_copy);
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID10)) {
- num_stripes = btrfs_super_num_devices(&info->super_copy);
+ num_stripes = btrfs_super_num_devices(info->super_copy);
if (num_stripes < 4)
return -ENOSPC;
num_stripes &= ~(u32)1;
@@ -730,24 +730,24 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
min_stripes = 4;
}
if (type & (BTRFS_BLOCK_GROUP_RAID5)) {
- num_stripes = btrfs_super_num_devices(&info->super_copy);
+ num_stripes = btrfs_super_num_devices(info->super_copy);
if (num_stripes < 2)
return -ENOSPC;
min_stripes = 2;
stripe_len = find_raid56_stripe_len(num_stripes - 1,
- btrfs_super_stripesize(&info->super_copy));
+ btrfs_super_stripesize(info->super_copy));
}
if (type & (BTRFS_BLOCK_GROUP_RAID6)) {
- num_stripes = btrfs_super_num_devices(&info->super_copy);
+ num_stripes = btrfs_super_num_devices(info->super_copy);
if (num_stripes < 3)
return -ENOSPC;
min_stripes = 3;
stripe_len = find_raid56_stripe_len(num_stripes - 2,
- btrfs_super_stripesize(&info->super_copy));
+ btrfs_super_stripesize(info->super_copy));
}
/* we don't want a chunk larger than 10% of the FS */
- percent_max = div_factor(btrfs_super_total_bytes(&info->super_copy), 1);
+ percent_max = div_factor(btrfs_super_total_bytes(info->super_copy), 1);
max_chunk_size = min(percent_max, max_chunk_size);
again:
@@ -1652,7 +1652,7 @@ int btrfs_read_super_device(struct btrfs_root *root, struct extent_buffer *buf)
int btrfs_read_sys_array(struct btrfs_root *root)
{
- struct btrfs_super_block *super_copy = &root->fs_info->super_copy;
+ struct btrfs_super_block *super_copy = root->fs_info->super_copy;
struct extent_buffer *sb;
struct btrfs_disk_key *disk_key;
struct btrfs_chunk *chunk;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 17:16:15 +0000