You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.6 KiB
51 lines
1.6 KiB
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> |
|
|
|
--- |
|
|
|
Note: reviewed but not yet merged upstream |
|
|
|
repair/dir2.c | 4 +++- |
|
1 file changed, 3 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/repair/dir2.c b/repair/dir2.c |
|
index e162d2b..225f926 100644 |
|
--- 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 ", "), |
|
-- |
|
2.9.5 |
|
|
|
-- |
|
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in |
|
the body of a message to majordomo@vger.kernel.org |
|
More majordomo info at http://vger.kernel.org/majordomo-info.html |
|
|
|
|
|
|