| Message ID | 20250324182044.832214-2-bodonnel@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | xfs_repair: fix link counts update following repair of a bad block | expand |
On 3/24/25 1:20 PM, bodonnel@redhat.com wrote: > From: Bill O'Donnell <bodonnel@redhat.com> > > Updating nlinks, following repair of a bad block needs a bit of work. > In unique cases, 2 runs of xfs_repair is needed to adjust the count to > the proper value. This patch modifies location of longform_dir2_entry_check, > moving longform_dir2_entry_check_data to run after the check_dir3_header > error check. This results in the hashtab to be correctly filled and those > entries don't end up in lost+found, and nlinks is properly adjusted on the > first xfs_repair pass. > > Suggested-by: Eric Sandeen <sandeen@sandeen.net> > > Signed-off-by: Bill O'Donnell <bodonnel@redhat.com> > --- > repair/phase6.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/repair/phase6.c b/repair/phase6.c > index 9cffbb1f4510..b0175326ea4a 100644 > --- a/repair/phase6.c > +++ b/repair/phase6.c > @@ -2404,6 +2404,10 @@ longform_dir2_entry_check( > > /* check v5 metadata */ > if (xfs_has_crc(mp)) { > + longform_dir2_entry_check_data(mp, ip, num_illegal, > + need_dot, > + irec, ino_offset, bp, hashtab, > + &freetab, da_bno, fmt == XFS_DIR2_FMT_BLOCK); > error = check_dir3_header(mp, bp, ino); > if (error) { > fixit++; This change would mean that longform_dir2_entry_check_data will never run on V4 filesystems, so that's not correct. I think we can approach my suggestions in 2 steps. 1) if longform_dir2_rebuild ends up with a shortform dir due to very few entries, I think it needs to add an extra ref at that point, as is done elsewhere for short form entries. 2) longform_dir2_entry_check() logic can be improved so that even if the header is bad, we still do directory block scanning via longform_dir2_entry_check_data so that longform_dir2_rebuild has something to work with. -Eric > @@ -2416,9 +2420,6 @@ longform_dir2_entry_check( > } > } > > - longform_dir2_entry_check_data(mp, ip, num_illegal, need_dot, > - irec, ino_offset, bp, hashtab, > - &freetab, da_bno, fmt == XFS_DIR2_FMT_BLOCK); > if (fmt == XFS_DIR2_FMT_BLOCK) > break; >
diff --git a/repair/phase6.c b/repair/phase6.c index 9cffbb1f4510..b0175326ea4a 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -2404,6 +2404,10 @@ longform_dir2_entry_check( /* check v5 metadata */ if (xfs_has_crc(mp)) { + longform_dir2_entry_check_data(mp, ip, num_illegal, + need_dot, + irec, ino_offset, bp, hashtab, + &freetab, da_bno, fmt == XFS_DIR2_FMT_BLOCK); error = check_dir3_header(mp, bp, ino); if (error) { fixit++; @@ -2416,9 +2420,6 @@ longform_dir2_entry_check( } } - longform_dir2_entry_check_data(mp, ip, num_illegal, need_dot, - irec, ino_offset, bp, hashtab, - &freetab, da_bno, fmt == XFS_DIR2_FMT_BLOCK); if (fmt == XFS_DIR2_FMT_BLOCK) break;