xfs
[Top] [All Lists]

[PATCH] xfs_repair: fix sibling pointer tests in verify_dir2_path()

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH] xfs_repair: fix sibling pointer tests in verify_dir2_path()
From: Eric Sandeen <sandeen@xxxxxxxxxx>
Date: Wed, 19 Feb 2014 15:10:13 -0600
Delivered-to: xfs@xxxxxxxxxxx
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.3.0
RH QE reported that if we create a 1G filesystem with default
options, mount it, and create inodes until full, then run
repair, repair reports corruption in verify_dir2_path() with:

> bad back pointer in block 8390324 for directory inode 131

The commit 88b32f0 xfs: add CRCs to dir2/da node blocks
had a small error which regressed this; although we switch
to the "newnode," to check sibling pointers, we re-populate
the node hdr with the old "node" data.  This causes the
backpointer test to be testing the wrong node's values.

Fixing this bug fixes the testcase.

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---

diff --git a/repair/dir2.c b/repair/dir2.c
index 3aabcaa..06dc000 100644
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -552,7 +552,7 @@ _("can't read block %u for directory inode %" PRIu64 "\n"),
 
                newnode = bp->b_addr;
                btree = xfs_da3_node_tree_p(newnode);
-               xfs_da3_node_hdr_from_disk(&nodehdr, node);
+               xfs_da3_node_hdr_from_disk(&nodehdr, newnode);
                /*
                 * verify magic number and back pointer, sanity-check
                 * entry count, verify level

<Prev in Thread] Current Thread [Next in Thread>