If a directory inode has an invalid parent ino on disk, repair
replaces the invalid value with a dummy value of zero in the buffer
and NULLFSINO in the in-core parent tracking. The zero value serves
no functional purpose as it is still an invalid value and the parent
must be repaired by phase 6 based on the in-core state before the
buffer can be written out. Instead, use the root fs inode number as
a catch all for invalid parent values so phase 6 doesn't have to
create custom verifier infrastructure just to work around this
behavior.
Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
---
repair/dir2.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/repair/dir2.c b/repair/dir2.c
index caf6963d..9c789b4a 100644
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -165,7 +165,6 @@ process_sf_dir2(
int tmp_elen;
int tmp_len;
xfs_dir2_sf_entry_t *tmp_sfep;
- xfs_ino_t zero = 0;
sfp = (struct xfs_dir2_sf_hdr *)XFS_DFORK_DPTR(dip);
max_size = XFS_DFORK_DSIZE(dip, mp);
@@ -497,7 +496,7 @@ _("bogus .. inode number (%" PRIu64 ") in directory inode %" PRIu64 ", "),
if (!no_modify) {
do_warn(_("clearing inode number\n"));
- libxfs_dir2_sf_put_parent_ino(sfp, zero);
+ libxfs_dir2_sf_put_parent_ino(sfp, mp->m_sb.sb_rootino);
*dino_dirty = 1;
*repair = 1;
} else {
@@ -532,7 +531,7 @@ _("bad .. entry in directory inode %" PRIu64 ", points to self, "),
if (!no_modify) {
do_warn(_("clearing inode number\n"));
- libxfs_dir2_sf_put_parent_ino(sfp, zero);
+ libxfs_dir2_sf_put_parent_ino(sfp, mp->m_sb.sb_rootino);
*dino_dirty = 1;
*repair = 1;
} else {
--
2.21.3
