Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: add nr_global_roots to the super block definition

We already have this defined in btrfs-progs, add it to the kernel to
make it easier to sync these files into btrfs-progs.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Josef Bacik and committed by
David Sterba
0c703003 8009adf3

+4 -1
+2
fs/btrfs/accessors.h
··· 889 889 BTRFS_SETGET_STACK_FUNCS(super_magic, struct btrfs_super_block, magic, 64); 890 890 BTRFS_SETGET_STACK_FUNCS(super_uuid_tree_generation, struct btrfs_super_block, 891 891 uuid_tree_generation, 64); 892 + BTRFS_SETGET_STACK_FUNCS(super_nr_global_roots, struct btrfs_super_block, 893 + nr_global_roots, 64); 892 894 893 895 /* struct btrfs_file_extent_item */ 894 896 BTRFS_SETGET_STACK_FUNCS(stack_file_extent_type, struct btrfs_file_extent_item,
+2 -1
include/uapi/linux/btrfs_tree.h
··· 688 688 /* The UUID written into btree blocks */ 689 689 __u8 metadata_uuid[BTRFS_FSID_SIZE]; 690 690 691 + __u64 nr_global_roots; 692 + 691 693 /* Future expansion */ 692 - __u8 reserved8[8]; 693 694 __le64 reserved[27]; 694 695 __u8 sys_chunk_array[BTRFS_SYSTEM_CHUNK_ARRAY_SIZE]; 695 696 struct btrfs_root_backup super_roots[BTRFS_NUM_BACKUP_ROOTS];