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

btrfs-progs: sb-mod: add dev_item prefix for sb::device members 

For parity with output of 'btrfs inspect dump-super', add the
"dev_item." prefix to the devid member. This allows adding more
members without conflicts (like it would be for device total_bytes).

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2020-10-19 20:40:26 +02:00
parent c875145cb3
commit 8de6816b47
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
btrfs-sb-mod.c
View File

@ -139,7 +139,8 @@ struct sb_field {
{ .name = "log_root_level", .type = TYPE_U8 }, { .name = "log_root_level", .type = TYPE_U8 },
{ .name = "cache_generation", .type = TYPE_U64 }, { .name = "cache_generation", .type = TYPE_U64 },
{ .name = "uuid_tree_generation", .type = TYPE_U64 }, { .name = "uuid_tree_generation", .type = TYPE_U64 },
{ .name = "devid", .type = TYPE_U64 }, /* Device item members */
{ .name = "dev_item.devid", .type = TYPE_U64 },
}; };
#define MOD_FIELD_XX(fname, set, val, bits, f_dec, f_hex, f_type) \ #define MOD_FIELD_XX(fname, set, val, bits, f_dec, f_hex, f_type) \
@ -156,14 +157,14 @@ struct sb_field {
} }
#define MOD_DEV_FIELD_XX(fname, set, val, bits, f_dec, f_hex, f_type) \ #define MOD_DEV_FIELD_XX(fname, set, val, bits, f_dec, f_hex, f_type) \
else if (strcmp(name, #fname) == 0) { \ else if (strcmp(name, "dev_item." #fname) == 0) { \
if (set) { \ if (set) { \
printf("SET: "#fname" "f_dec" (0x"f_hex")\n", \ printf("SET: dev_item."#fname" "f_dec" (0x"f_hex")\n", \
(f_type)*val, (f_type)*val); \ (f_type)*val, (f_type)*val); \
sb->dev_item.fname = cpu_to_le##bits(*val); \ sb->dev_item.fname = cpu_to_le##bits(*val); \
} else { \ } else { \
*val = le##bits##_to_cpu(sb->dev_item.fname); \ *val = le##bits##_to_cpu(sb->dev_item.fname); \
printf("GET: "#fname" "f_dec" (0x"f_hex")\n", \ printf("GET: dev_item."#fname" "f_dec" (0x"f_hex")\n", \
(f_type)*val, (f_type)*val); \ (f_type)*val, (f_type)*val); \
} \ } \
} }