This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master
in repository gfs2-utils.
commit 1f4d0da2c8ffd37e7d6324c020ccc11738965f6d
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri May 22 00:13:19 2020 +0100
libgfs2: Add a display name field to struct lgfs2_metadata
.name is used for the name of the struct and we have places that need to
tag blocks with a more descriptive name for users to read, so add a
display name for each block type.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/libgfs2/libgfs2.h | 3 ++-
gfs2/libgfs2/meta.c | 30 +++++++++++++++++++++++++++++-
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 7ede196..5350f3d 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -146,7 +146,8 @@ struct lgfs2_metadata {
const unsigned header:1;
const uint32_t mh_type;
const uint32_t mh_format;
- const char *name;
+ const char *name; /* Struct name */
+ const char *display; /* Short name for non-programmers */
const struct lgfs2_metafield *fields;
const unsigned nfields;
const unsigned size;
diff --git a/gfs2/libgfs2/meta.c b/gfs2/libgfs2/meta.c
index 1da7414..5ac808c 100644
--- a/gfs2/libgfs2/meta.c
+++ b/gfs2/libgfs2/meta.c
@@ -560,6 +560,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_SB,
.mh_format = GFS2_FORMAT_SB,
.name = "gfs2_sb",
+ .display = "superblock",
.fields = gfs2_sb_fields,
.nfields = ARRAY_SIZE(gfs2_sb_fields),
.size = sizeof(struct gfs2_sb),
@@ -570,13 +571,15 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_SB,
.mh_format = GFS_FORMAT_SB,
.name = "gfs_sb",
+ .display = "superblock",
.fields = gfs_sb_fields,
.nfields = ARRAY_SIZE(gfs_sb_fields),
.size = sizeof(struct gfs_sb),
},
[LGFS2_MT_RINDEX] = {
.versions = LGFS2_MD_GFS1 | LGFS2_MD_GFS2,
- .name = "rindex",
+ .name = "gfs2_rindex",
+ .display = "resource group index",
.fields = gfs2_rindex_fields,
.nfields = ARRAY_SIZE(gfs2_rindex_fields),
.size = sizeof(struct gfs2_rindex),
@@ -587,6 +590,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_RG,
.mh_format = GFS2_FORMAT_RG,
.name = "gfs2_rgrp",
+ .display = "resource group",
.fields = gfs2_rgrp_fields,
.nfields = ARRAY_SIZE(gfs2_rgrp_fields),
.size = sizeof(struct gfs2_rgrp),
@@ -597,6 +601,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_RG,
.mh_format = GFS2_FORMAT_RG,
.name = "gfs_rgrp",
+ .display = "resource group",
.fields = gfs_rgrp_fields,
.nfields = ARRAY_SIZE(gfs_rgrp_fields),
.size = sizeof(struct gfs_rgrp),
@@ -607,6 +612,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_RB,
.mh_format = GFS2_FORMAT_RB,
.name = "gfs2_rgrp_bitmap",
+ .display = "allocation bitmap",
.fields = gfs2_rgrp_bitmap_fields,
.nfields = ARRAY_SIZE(gfs2_rgrp_bitmap_fields),
.size = sizeof(struct gfs2_meta_header),
@@ -617,6 +623,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_DI,
.mh_format = GFS2_FORMAT_DI,
.name = "gfs2_dinode",
+ .display = "inode",
.fields = gfs2_dinode_fields,
.nfields = ARRAY_SIZE(gfs2_dinode_fields),
.size = sizeof(struct gfs2_dinode),
@@ -627,6 +634,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_DI,
.mh_format = GFS2_FORMAT_DI,
.name = "gfs_dinode",
+ .display = "inode",
.fields = gfs_dinode_fields,
.nfields = ARRAY_SIZE(gfs_dinode_fields),
.size = sizeof(struct gfs_dinode),
@@ -637,6 +645,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_IN,
.mh_format = GFS2_FORMAT_IN,
.name = "gfs2_indirect",
+ .display = "indirect",
.fields = gfs2_indirect_fields,
.nfields = ARRAY_SIZE(gfs2_indirect_fields),
.size = sizeof(struct gfs2_meta_header),
@@ -647,6 +656,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_IN,
.mh_format = GFS2_FORMAT_IN,
.name = "gfs_indirect",
+ .display = "indirect",
.fields = gfs_indirect_fields,
.nfields = ARRAY_SIZE(gfs_indirect_fields),
.size = sizeof(struct gfs_indirect),
@@ -657,6 +667,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_LF,
.mh_format = GFS2_FORMAT_LF,
.name = "gfs2_leaf",
+ .display = "leaf",
.fields = gfs2_leaf_fields,
.nfields = ARRAY_SIZE(gfs2_leaf_fields),
.size = sizeof(struct gfs2_leaf),
@@ -667,6 +678,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_JD,
.mh_format = GFS2_FORMAT_JD,
.name = "gfs2_jdata",
+ .display = "journal data",
.fields = gfs2_jdata_fields,
.nfields = ARRAY_SIZE(gfs2_jdata_fields),
.size = sizeof(struct gfs2_meta_header),
@@ -677,6 +689,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_LH,
.mh_format = GFS2_FORMAT_LH,
.name = "gfs2_log_header",
+ .display = "log header",
.fields = gfs2_log_header_fields,
.nfields = ARRAY_SIZE(gfs2_log_header_fields),
.size = sizeof(struct gfs2_log_header),
@@ -687,6 +700,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_LH,
.mh_format = GFS2_FORMAT_LH,
.name = "gfs_log_header",
+ .display = "log header",
.fields = gfs_log_header_fields,
.nfields = ARRAY_SIZE(gfs_log_header_fields),
.size = sizeof(struct gfs_log_header),
@@ -697,6 +711,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_LD,
.mh_format = GFS2_FORMAT_LD,
.name = "gfs2_log_desc",
+ .display = "log descriptor",
.fields = gfs2_log_desc_fields,
.nfields = ARRAY_SIZE(gfs2_log_desc_fields),
.size = sizeof(struct gfs2_log_descriptor),
@@ -707,6 +722,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_LD,
.mh_format = GFS2_FORMAT_LD,
.name = "gfs_log_desc",
+ .display = "log descriptor",
.fields = gfs_log_desc_fields,
.nfields = ARRAY_SIZE(gfs_log_desc_fields),
.size = sizeof(struct gfs_log_descriptor),
@@ -717,6 +733,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_LB,
.mh_format = GFS2_FORMAT_LB,
.name = "gfs2_log_block",
+ .display = "log",
.fields = gfs2_log_block_fields,
.nfields = ARRAY_SIZE(gfs2_log_block_fields),
.size = sizeof(struct gfs2_meta_header),
@@ -727,6 +744,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_EA,
.mh_format = GFS2_FORMAT_EA,
.name = "gfs2_ea_attr",
+ .display = "extended attribute",
.fields = gfs2_ea_attr_fields,
.nfields = ARRAY_SIZE(gfs2_ea_attr_fields),
.size = sizeof(struct gfs2_meta_header),
@@ -737,6 +755,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
.mh_type = GFS2_METATYPE_ED,
.mh_format = GFS2_FORMAT_ED,
.name = "gfs2_ea_data",
+ .display = "extended attribute data",
.fields = gfs2_ea_data_fields,
.nfields = ARRAY_SIZE(gfs2_ea_data_fields),
.size = sizeof(struct gfs2_meta_header),
@@ -744,6 +763,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_GFS2_QUOTA_CHANGE] = {
.versions = LGFS2_MD_GFS2,
.name = "gfs2_quota_change",
+ .display = "quota change",
.fields = gfs2_quota_change_fields,
.nfields = ARRAY_SIZE(gfs2_quota_change_fields),
.size = sizeof(struct gfs2_quota_change),
@@ -751,6 +771,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_DIRENT] = {
.versions = LGFS2_MD_GFS1 | LGFS2_MD_GFS2,
.name = "gfs2_dirent",
+ .display = "directory entry",
.fields = gfs2_dirent_fields,
.nfields = ARRAY_SIZE(gfs2_dirent_fields),
.size = sizeof(struct gfs2_dirent),
@@ -758,6 +779,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_EA_HEADER] = {
.versions = LGFS2_MD_GFS1 | LGFS2_MD_GFS2,
.name = "gfs2_ea_header",
+ .display = "extended attribute header",
.fields = gfs2_ea_header_fields,
.nfields = ARRAY_SIZE(gfs2_ea_header_fields),
.size = sizeof(struct gfs2_ea_header),
@@ -765,6 +787,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_GFS2_INUM_RANGE] = {
.versions = LGFS2_MD_GFS2,
.name = "gfs2_inum_range",
+ .display = "inum range",
.fields = gfs2_inum_range_fields,
.nfields = ARRAY_SIZE(gfs2_inum_range_fields),
.size = sizeof(struct gfs2_inum_range),
@@ -772,6 +795,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_STATFS_CHANGE] = {
.versions = LGFS2_MD_GFS1 | LGFS2_MD_GFS2,
.name = "gfs2_statfs_change",
+ .display = "statfs change",
.fields = gfs2_statfs_change_fields,
.nfields = ARRAY_SIZE(gfs2_statfs_change_fields),
.size = sizeof(struct gfs2_statfs_change),
@@ -779,6 +803,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_GFS_JINDEX] = {
.versions = LGFS2_MD_GFS1,
.name = "gfs_jindex",
+ .display = "journal index",
.fields = gfs_jindex_fields,
.nfields = ARRAY_SIZE(gfs_jindex_fields),
.size = sizeof(struct gfs_jindex),
@@ -786,6 +811,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_GFS_BLOCK_TAG] = {
.versions = LGFS2_MD_GFS1,
.name = "gfs_block_tag",
+ .display = "block tag",
.fields = gfs_block_tag_fields,
.nfields = ARRAY_SIZE(gfs_block_tag_fields),
.size = sizeof(struct gfs_block_tag),
@@ -793,10 +819,12 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
[LGFS2_MT_DATA] = {
.versions = LGFS2_MD_GFS1 | LGFS2_MD_GFS2,
.name = "data",
+ .display = "data",
},
[LGFS2_MT_FREE] = {
.versions = LGFS2_MD_GFS1 | LGFS2_MD_GFS2,
.name = "free",
+ .display = "free",
},
};
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.