xfs_repair: Fix root inode's parent when it's bogus for sf directory

Currently when root inode is in short-form and its parent ino
has an invalid value, process_sf_dir2() ends up not fixing it,
because if verify_inum() fails we never get to the next case which
would fix the root inode's parent pointer.

This behavior triggers the following assert on process_dir2():

   ASSERT((ino != mp->m_sb.sb_rootino && ino != *parent) ||
        (ino == mp->m_sb.sb_rootino &&
        (ino == *parent || need_root_dotdot == 1)));

This patch fixes this behavior by making sure we always properly
handle rootino parent pointer in process_sf_dir2()

Signed-off-by: Marco Benatto <mbenatto@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/repair/dir2.c b/repair/dir2.c
index e162d2b8e3856fa273e0d148e3c21ea025c7c6c4..225f9266135a97cfac78c377466762a457f8d71d 100644 (file)
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -495,8 +495,10 @@ _("corrected entry offsets in directory %" PRIu64 "\n"),
 
        /*
         * if parent entry is bogus, null it out.  we'll fix it later .
+        * If the validation fails for the root inode we fix it in
+        * the next else case.
         */
-       if (verify_inum(mp, *parent))  {
+       if (verify_inum(mp, *parent) && ino != mp->m_sb.sb_rootino)  {
 
                do_warn(
 _("bogus .. inode number (%" PRIu64 ") in directory inode %" PRIu64 ", "),