repair tidyups for metadir handling v3
Hi all,
I recently played with adding another metafile type, and of course messed up my first attempt. This series enhances the metadir repair code a bit based on things I found while debugging that, and in the last patch changes repair to warn about unexpected metafile types.
Changes since v2:
- more gettext!
Changes since v1:
- add N_() annotations for gettext
- add a build-time size assert for the inode type names
- fix a comment typo
PATCH 1/4 repair: add a enum for the XR_INO_* values
Move the XR_INO_ definitions into dinode.c as they aren't used anywhere else, and turn them into an enum to improve type safety.
--- repair/dinode.c | 52 +++++++++++++++++++++++++++++++++++-------------- repair/incore.h | 19 ------------------ 2 files changed, 37 insertions(+), 34 deletions(-)
repair/dinode.c +37 -15
@@ -23,6 +23,26 @@#include "bmap_repair.h" #include "rt.h" +/* inode types */ +enum xr_ino_type { +XR_INO_UNKNOWN ,/* unknown */ +XR_INO_DIR ,/* directory */ +XR_INO_RTDATA ,/* realtime file */ +XR_INO_RTBITMAP ,/* realtime bitmap inode */ +XR_INO_RTSUM ,/* realtime summary inode */ +XR_INO_DATA ,/* regular file */ +XR_INO_SYMLINK ,/* symlink */ +XR_INO_CHRDEV ,/* character device */ +XR_INO_BLKDEV ,/* block device */ +XR_INO_SOCK ,/* socket */ +XR_INO_FIFO ,/* fifo */ +XR_INO_UQUOTA ,/* user quota inode */ +XR_INO_GQUOTA ,/* group quota inode */ +XR_INO_PQUOTA ,/* project quota inode */ +XR_INO_RTRMAP ,/* realtime rmap */ +XR_INO_RTREFC ,/* realtime refcount */ +}; +/* * gettext lookups for translations of strings use mutexes internally to * the library. Hence when we come through here doing parallel scans in
@@ -482,7 +502,7 @@ out_unlock:static inline bool is_reflink_type (struct xfs_mount *mp, -int type) +enum xr_ino_type type) {if (type ==XR_INO_DATA &&xfs_has_reflink (mp))return true;
@@ -503,7 +523,7 @@ process_bmbt_reclist_int( xfs_mount_t *mp, xfs_bmbt_rec_t *rp, xfs_extnum_t *numrecs, - int type, + enum xr_ino_type type, xfs_ino_t ino, xfs_rfsblock_t *tot, blkmap_t **blkmapp,
@@ -952,7 +972,7 @@ process_rtrmap(xfs_agnumber_t agno, xfs_agino_t ino, struct xfs_dinode *dip, - int type, + enum xr_ino_type type, int *dirty, xfs_rfsblock_t *tot, uint64_t *nex,
@@ -1123,7 +1143,7 @@ process_rtrefc(xfs_agnumber_t agno, xfs_agino_t ino, struct xfs_dinode *dip, - int type, + enum xr_ino_type type, int *dirty, xfs_rfsblock_t *tot, uint64_t *nex,
@@ -1279,7 +1299,7 @@ process_btinode(xfs_agnumber_t agno, xfs_agino_t ino, struct xfs_dinode *dip, - int type, + enum xr_ino_type type, int *dirty, xfs_rfsblock_t *tot, xfs_extnum_t *nex,
@@ -1455,7 +1475,7 @@ process_exinode(xfs_agnumber_t agno, xfs_agino_t ino, struct xfs_dinode *dip, - int type, + enum xr_ino_type type, int *dirty, xfs_rfsblock_t *tot, xfs_extnum_t *nex,
@@ -1648,7 +1668,7 @@ process_quota_inode(struct xfs_mount *mp, xfs_ino_t lino, struct xfs_dinode *dino, - uint ino_type, + enum xr_ino_type ino_type, struct blkmap *blkmap) { xfs_fsblock_t fsbno;
@@ -1935,7 +1955,7 @@ process_misc_ino_types(xfs_mount_t *mp, struct xfs_dinode *dino, xfs_ino_t lino, - int type) + enum xr_ino_type type) {/* * must also have a zero size
@@ -1982,7 +2002,10 @@ _("size of quota inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, }static int -process_misc_ino_types_blocks (xfs_rfsblock_t totblocks,xfs_ino_t lino,int type) +process_misc_ino_types_blocks ( +xfs_rfsblock_t totblocks, +xfs_ino_t lino, +enum xr_ino_type type) {/* * you can not enforce all misc types have zero data fork blocks
@@ -2092,7 +2115,7 @@ process_check_rt_inode(struct xfs_mount *mp, struct xfs_dinode *dinoc, xfs_ino_t lino, - int *type, + enum xr_ino_type *type, int *dirty, int expected_type, const char *tag)
@@ -2130,7 +2153,7 @@ process_check_metadata_inodes( xfs_mount_t *mp, struct xfs_dinode *dinoc, xfs_ino_t lino, - int *type, + enum xr_ino_type *type, int *dirty) { if (lino == mp->m_sb.sb_rootino) {
@@ -2205,7 +2228,7 @@ process_check_inode_sizes(xfs_mount_t *mp, struct xfs_dinode *dino, xfs_ino_t lino, - int type) + enum xr_ino_type type) { xfs_fsize_t size = be64_to_cpu(dino->di_size);
@@ -2466,7 +2489,7 @@ process_inode_data_fork(xfs_agnumber_t agno, xfs_agino_t ino, struct xfs_dinode **dinop, - int type, + enum xr_ino_type type, int *dirty, xfs_rfsblock_t *totblocks, xfs_extnum_t *nextents,
@@ -3029,10 +3052,10 @@ process_dinode_int(xfs_ino_t *parent,/* out -- parent if ino is a dir */ struct xfs_buf **ino_bpp) { + enum xr_ino_type type = XR_INO_UNKNOWN;xfs_rfsblock_t totblocks =0 ;xfs_rfsblock_t atotblocks =0 ;int di_mode; -int type;int retval =0 ;xfs_extnum_t nextents;xfs_extnum_t anextents;
@@ -3048,7 +3071,6 @@ process_dinode_int( *dirty = *isa_dir =0 ; *used = is_used; - type =XR_INO_UNKNOWN ; lino =XFS_AGINO_TO_INO (mp, agno, ino); di_mode =be16_to_cpu (dino->di_mode);
repair/incore.h +0 -19
@@ -225,25 +225,6 @@ int count_bcnt_extents(xfs_agnumber_t);* inode definitions */ -/* inode types */ - -#define XR_INO_UNKNOWN 0/* unknown */ -#define XR_INO_DIR 1/* directory */ -#define XR_INO_RTDATA 2/* realtime file */ -#define XR_INO_RTBITMAP 3/* realtime bitmap inode */ -#define XR_INO_RTSUM 4/* realtime summary inode */ -#define XR_INO_DATA 5/* regular file */ -#define XR_INO_SYMLINK 6/* symlink */ -#define XR_INO_CHRDEV 7/* character device */ -#define XR_INO_BLKDEV 8/* block device */ -#define XR_INO_SOCK 9/* socket */ -#define XR_INO_FIFO 10/* fifo */ -#define XR_INO_UQUOTA 12/* user quota inode */ -#define XR_INO_GQUOTA 13/* group quota inode */ -#define XR_INO_PQUOTA 14/* project quota inode */ -#define XR_INO_RTRMAP 15/* realtime rmap */ -#define XR_INO_RTREFC 16/* realtime refcount */ -/* inode allocation tree */ /*
Signature · 1 line
2.47.3
PATCH 2/4 repair: add canonical names for the XR_INO_ constants
In reply to Christoph HellwigAdd an array with the canonical name for each inode type so that code doesn't have to implement switch statements for that, and remove the now trivial process_misc_ino_types and process_misc_ino_types_blocks functions.
--- repair/dinode.c | 159 +++++++++++++++--------------------------------- 1 file changed, 50 insertions(+), 109 deletions(-)
repair/dinode.c +50 -109
@@ -41,8 +41,29 @@ enum xr_ino_type {XR_INO_PQUOTA ,/* project quota inode */ XR_INO_RTRMAP ,/* realtime rmap */ XR_INO_RTREFC ,/* realtime refcount */ +XR_INO_MAX }; +static const char *xr_ino_type_name[] = { + [XR_INO_UNKNOWN ] =N_ ("unknown" ), + [XR_INO_DIR ] =N_ ("directory" ), + [XR_INO_RTDATA ] =N_ ("realtime file" ), + [XR_INO_RTBITMAP ] =N_ ("realtime bitmap" ), + [XR_INO_RTSUM ] =N_ ("realtime summary" ), + [XR_INO_DATA ] =N_ ("regular file" ), + [XR_INO_SYMLINK ] =N_ ("symlink" ), + [XR_INO_CHRDEV ] =N_ ("character device" ), + [XR_INO_BLKDEV ] =N_ ("block device" ), + [XR_INO_SOCK ] =N_ ("socket" ), + [XR_INO_FIFO ] =N_ ("fifo" ), + [XR_INO_UQUOTA ] =N_ ("user quota" ), + [XR_INO_GQUOTA ] =N_ ("group quota" ), + [XR_INO_PQUOTA ] =N_ ("project quota" ), + [XR_INO_RTRMAP ] =N_ ("realtime rmap" ), + [XR_INO_RTREFC ] =N_ ("realtime refcount" ), +}; +static_assert (ARRAY_SIZE (xr_ino_type_name) ==XR_INO_MAX ); +/* * gettext lookups for translations of strings use mutexes internally to * the library. Hence when we come through here doing parallel scans in
@@ -1946,106 +1967,6 @@ _("found illegal null character in symlink inode %" PRIu64 "\n"),return (0 ); } -/* -* called to process the set of misc inode special inode types -* that have no associated data storage (fifos, pipes, devices, etc.). -*/ -static int -process_misc_ino_types ( -xfs_mount_t *mp, -struct xfs_dinode *dino, -xfs_ino_t lino, -enum xr_ino_type type) -{ -/* -* must also have a zero size -*/ -if (be64_to_cpu (dino->di_size) !=0 ) { -switch (type) { -case XR_INO_CHRDEV : -do_warn ( -_ ("size of character device inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (int64_t )be64_to_cpu (dino->di_size)); -break ; -case XR_INO_BLKDEV : -do_warn ( -_ ("size of block device inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (int64_t )be64_to_cpu (dino->di_size)); -break ; -case XR_INO_SOCK : -do_warn ( -_ ("size of socket inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (int64_t )be64_to_cpu (dino->di_size)); -break ; -case XR_INO_FIFO : -do_warn ( -_ ("size of fifo inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (int64_t )be64_to_cpu (dino->di_size)); -break ; -case XR_INO_UQUOTA : -case XR_INO_GQUOTA : -case XR_INO_PQUOTA : -do_warn ( -_ ("size of quota inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (int64_t )be64_to_cpu (dino->di_size)); -break ; -default : -do_warn (_ ("Internal error - process_misc_ino_types, " -"illegal type %d\n" ), type); -abort (); - } - -return (1 ); - } - -return (0 ); -} - -static int -process_misc_ino_types_blocks ( -xfs_rfsblock_t totblocks, -xfs_ino_t lino, -enum xr_ino_type type) -{ -/* -* you can not enforce all misc types have zero data fork blocks -* by checking dino->di_nblocks because atotblocks (attribute -* blocks) are part of nblocks. We must check this later when atotblocks -* has been calculated or by doing a simple check that anExtents == 0. -* We must also guarantee that totblocks is 0. Thus nblocks checking -* will be done later in process_dinode_int for misc types. -*/ - -if (totblocks !=0 ) { -switch (type) { -case XR_INO_CHRDEV : -do_warn ( -_ ("size of character device inode %" PRIu64" != 0 (%" PRIu64" blocks)\n" ), - lino, totblocks); -break ; -case XR_INO_BLKDEV : -do_warn ( -_ ("size of block device inode %" PRIu64" != 0 (%" PRIu64" blocks)\n" ), - lino, totblocks); -break ; -case XR_INO_SOCK : -do_warn ( -_ ("size of socket inode %" PRIu64" != 0 (%" PRIu64" blocks)\n" ), - lino, totblocks); -break ; -case XR_INO_FIFO : -do_warn ( -_ ("size of fifo inode %" PRIu64" != 0 (%" PRIu64" blocks)\n" ), - lino, totblocks); -break ; -default : -return (0 ); - } -return (1 ); - } -return (0 ); -} -static inline int dinode_fmt (struct xfs_dinode *dino)
@@ -2261,16 +2182,20 @@ _("directory inode %" PRIu64 " has bad size %" PRId64 "\n"),case XR_INO_BLKDEV :case XR_INO_SOCK :case XR_INO_FIFO : -if (process_misc_ino_types (mp, dino, lino, type)) -return 1 ; -break ; -case XR_INO_UQUOTA :case XR_INO_GQUOTA :case XR_INO_PQUOTA : -/* Quota inodes have same restrictions as above types */ -if (process_misc_ino_types (mp, dino, lino, type)) +/* +* Misc inode types that have no associated data storage (fifos, +* pipes, devices, etc.) and thus must also have a zero size. +*/ +if (dino->di_size !=0 ) { +do_warn ( +_ ("size of %s inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), +_ (xr_ino_type_name[type]), lino, + (int64_t )be64_to_cpu (dino->di_size));return 1 ; + }break ;case XR_INO_RTDATA :
@@ -3704,10 +3629,26 @@ _("bad (negative) size %" PRId64 " on inode %" PRIu64 "\n"), dino = *dinop;/* -* enforce totblocks is 0 for misc types +* Enforce totblocks is 0 for misc types. +* +* Note that di_nblocks includes attribute fork blocks, so we can only +* do this here instead of when reading the inode. */ -if (process_misc_ino_types_blocks (totblocks, lino, type)) - goto clear_bad_out; +switch (type) { +case XR_INO_CHRDEV : +case XR_INO_BLKDEV : +case XR_INO_SOCK : +case XR_INO_FIFO : +if (totblocks !=0 ) { +do_warn ( +_ ("size of %s inode %" PRIu64" != 0 (%" PRIu64" blocks)\n" ), +_ (xr_ino_type_name[type]), lino, totblocks); + goto clear_bad_out; + } +break ; +default : +break ; + }/* * correct space counters if required
Signature · 1 line
2.47.3
PATCH 3/4 repair: factor out a process_dinode_metafile helper
In reply to Christoph HellwigSplit the metafile logic from process_dinode_int into a separate helper.
--- repair/dinode.c | 87 ++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 40 deletions(-)
repair/dinode.c +47 -40
@@ -2950,6 +2950,52 @@ _("Bad CoW extent size hint %u on inode %" PRIu64 ", "), } } +/* +* We always rebuild the metadata directory tree during phase 6, so we mark all +* directory blocks and other metadata files whose contents we don't want to +* save to be zapped. +* +* Currently, there are no metadata files that use xattrs, so we always drop the +* xattr blocks of metadata files. Parent pointers will be rebuilt during +* phase 6. +*/ +static bool +process_dinode_metafile ( +struct xfs_mount *mp, +xfs_agnumber_t agno, +xfs_agino_t agino, +xfs_ino_t lino, +enum xr_ino_type type) +{ +struct ino_tree_node *irec =find_inode_rec (mp, agno, agino); +int off =get_inode_offset (mp, lino, irec); + +set_inode_is_meta (irec, off); + +switch (type) { +case XR_INO_RTBITMAP : +case XR_INO_RTSUM : +/* +* RT bitmap and summary files are always recreated when +* rtgroups are enabled. For older filesystems, they exist at +* fixed locations and cannot be zapped. +*/ +if (xfs_has_rtgroups (mp)) +return true; +return false; +case XR_INO_UQUOTA : +case XR_INO_GQUOTA : +case XR_INO_PQUOTA : +/* +* Quota checking and repair doesn't happen until phase7, so +* preserve quota inodes and their contents for later. +*/ +return false; +default : +return true; + } +} +/* * returns 0 if the inode is ok, 1 if the inode is corrupt * check_dups can be set to 1 *only* when called by the
@@ -3565,48 +3611,9 @@ _("bad (negative) size %" PRId64 " on inode %" PRIu64 "\n"),/* Does this inode think it was metadata? */ if (dino->di_version >=3 && (dino->di_flags2 &cpu_to_be64 (XFS_DIFLAG2_METADATA ))) { -struct ino_tree_node *irec; -int off; - - irec =find_inode_rec (mp, agno, ino); - off =get_inode_offset (mp, lino, irec); -set_inode_is_meta (irec, off); is_meta = true; - -/* -* We always rebuild the metadata directory tree during phase -* 6, so we use this flag to get all the directory blocks -* marked as free, and any other metadata files whose contents -* we don't want to save. -* -* Currently, there are no metadata files that use xattrs, so -* we always drop the xattr blocks of metadata files. Parent -* pointers will be rebuilt during phase 6. -*/ -switch (type) { -case XR_INO_RTBITMAP : -case XR_INO_RTSUM : -/* -* rt bitmap and summary files are always recreated -* when rtgroups are enabled. For older filesystems, -* they exist at fixed locations and cannot be zapped. -*/ -if (xfs_has_rtgroups (mp)) - zap_metadata = true; -break ; -case XR_INO_UQUOTA : -case XR_INO_GQUOTA : -case XR_INO_PQUOTA : -/* -* Quota checking and repair doesn't happen until -* phase7, so preserve quota inodes and their contents -* for later. -*/ -break ; -default : +if (process_dinode_metafile (mp, agno, ino, lino, type)) zap_metadata = true; -break ; - } }/*
Signature · 1 line
2.47.3
PATCH 4/4 repair: enhance process_dinode_metafile
In reply to Christoph HellwigExplicitly list the destiny of each metafile inode type, and warn about unexpected types instead of just silently zapping them.
--- repair/dinode.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-)
repair/dinode.c +23 -13
@@ -2965,7 +2965,8 @@ process_dinode_metafile(xfs_agnumber_t agno, xfs_agino_t agino, xfs_ino_t lino, - enum xr_ino_type type) + enum xr_ino_type type, + bool *zap_metadata) { struct ino_tree_node *irec = find_inode_rec(mp, agno, agino);int off =get_inode_offset (mp, lino, irec);
@@ -2973,16 +2974,6 @@ process_dinode_metafile(set_inode_is_meta (irec, off);switch (type) { -case XR_INO_RTBITMAP : -case XR_INO_RTSUM : -/* -* RT bitmap and summary files are always recreated when -* rtgroups are enabled. For older filesystems, they exist at -* fixed locations and cannot be zapped. -*/ -if (xfs_has_rtgroups (mp)) -return true; -return false;case XR_INO_UQUOTA :case XR_INO_GQUOTA :case XR_INO_PQUOTA :
@@ -2991,7 +2982,25 @@ process_dinode_metafile(* preserve quota inodes and their contents for later. */ return false; +case XR_INO_DIR : +case XR_INO_RTBITMAP : +case XR_INO_RTSUM : +case XR_INO_RTRMAP : +case XR_INO_RTREFC : +/* +* These are always recreated. Note that for pre-metadir file +* systems, the RT bitmap and summary inodes need to be +* preserved, but we'll never end up here for them. +*/ + *zap_metadata = true; +return false;default : +do_warn (_ ("unexpected %s inode %" PRIu64" with metadata flag" ), + xr_ino_type_name[type], lino); +if (!no_modify) +do_warn (_ (" will zap\n" )); +else +do_warn (_ (" would zap\n" ));return true; } }
@@ -3612,8 +3621,9 @@ _("bad (negative) size %" PRId64 " on inode %" PRIu64 "\n"),if (dino->di_version >=3 && (dino->di_flags2 &cpu_to_be64 (XFS_DIFLAG2_METADATA ))) { is_meta = true; -if (process_dinode_metafile (mp, agno, ino, lino, type)) - zap_metadata = true; +if (process_dinode_metafile (mp, agno, ino, lino, type, + &zap_metadata)) + goto bad_out; }/*
Signature · 1 line
2.47.3