From: Bill O'Donnell <bodonnel@xxxxxxxxxx>
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,
to handle both longform and shortform directory cases. 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@xxxxxxxxxxx>
Signed-off-by: Bill O'Donnell <bodonnel@xxxxxxxxxx>
---
v3: fix logic to cover the shortform directory case, and fix the description
v2: attempt to cover the case where header indicates shortform directory
v1:
repair/phase6.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/repair/phase6.c b/repair/phase6.c
index dbc090a54139..4a3fafab3522 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -2424,6 +2424,11 @@ longform_dir2_entry_check(
continue;
}
+ /* salvage any dirents that look ok */
+ longform_dir2_entry_check_data(mp, ip, num_illegal, need_dot,
+ irec, ino_offset, bp, hashtab,
+ &freetab, da_bno, fmt == XFS_DIR2_FMT_BLOCK);
+
/* check v5 metadata */
if (xfs_has_crc(mp)) {
error = check_dir3_header(mp, bp, ino);
@@ -2438,9 +2443,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;
--
2.49.0
