RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: unify size of btrfs_super_block and BTRFS_SUPER_INFO_SIZE 

Just like kernel change, pad struct btrfs_super_block to 4096 bytes. As
ctree.h is part of public headers, use raw number for the superblock
offset.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2021-10-21 09:40:18 +08:00 committed by David Sterba
parent c0c307c313
commit 76f1a2ed57
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-shared/ctree.h
View File

@ -410,6 +410,9 @@ struct btrfs_root_backup {
u8 unused_8[10]; u8 unused_8[10];
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
#define BTRFS_SUPER_INFO_OFFSET (65536)
#define BTRFS_SUPER_INFO_SIZE (4096)
/* /*
* the super block basically lists the main trees of the FS * the super block basically lists the main trees of the FS
* it currently lacks any block count etc etc * it currently lacks any block count etc etc
@ -460,7 +463,10 @@ struct btrfs_super_block {
__le64 reserved[28]; __le64 reserved[28];
u8 sys_chunk_array[BTRFS_SYSTEM_CHUNK_ARRAY_SIZE]; u8 sys_chunk_array[BTRFS_SYSTEM_CHUNK_ARRAY_SIZE];
struct btrfs_root_backup super_roots[BTRFS_NUM_BACKUP_ROOTS]; struct btrfs_root_backup super_roots[BTRFS_NUM_BACKUP_ROOTS];
/* Padded to 4096 bytes */
u8 padding[565];
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
BUILD_ASSERT(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE);
/* /*
* Compat flags that we support. If any incompat flags are set other than the * Compat flags that we support. If any incompat flags are set other than the

3
kernel-shared/disk-io.h
View File

@ -23,9 +23,6 @@
#include "kernel-shared/ctree.h" #include "kernel-shared/ctree.h"
#include "kernel-lib/sizes.h" #include "kernel-lib/sizes.h"
#define BTRFS_SUPER_INFO_OFFSET SZ_64K
#define BTRFS_SUPER_INFO_SIZE 4096
#define BTRFS_SUPER_MIRROR_MAX 3 #define BTRFS_SUPER_MIRROR_MAX 3
#define BTRFS_SUPER_MIRROR_SHIFT 12 #define BTRFS_SUPER_MIRROR_SHIFT 12