Fix up check of right most branch in a multi-level extent btree

Merge of master-melb:xfs-cmds:25836a by kenmcd.

  pv:952341
  Fix up check of right most branch in a multi-level extent btree

diff --git a/repair/scan.c b/repair/scan.c
index 32c73efa38ac1d913b1b27fba91ad1ae8b7fb184..ee0eac553a40f2b63d75cbee76cea8d274855adc 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -434,17 +434,18 @@ _("out-of-order bmap key (file offset) in inode %llu, %s fork, fsbno %llu\n"),
        }
 
        /*
-        * Check that the last child block's forward sibling pointer
-        * is NULL.
+        * If we're the last node at our level, check that the last child 
+        * block's forward sibling pointer is NULL.
         */
        if (check_dups == 0 &&
+               bm_cursor->level[level].right_fsbno == NULLDFSBNO &&
                bm_cursor->level[level - 1].right_fsbno != NULLDFSBNO)  {
                do_warn(
        _("bad fwd (right) sibling pointer (saw %llu should be NULLDFSBNO)\n"
          "\tin inode %llu (%s fork) bmap btree block %llu\n"),
                        bm_cursor->level[level - 1].right_fsbno,
                        ino, forkname,
-                       bm_cursor->level[level].fsbno);
+                       bm_cursor->level[level - 1].fsbno);
                return(1);
        }