[PATCH 12/13 V2] xfs_repair: don't clear . or .. in process_dir2_data

Eric Sandeen
2015-03-23T20:18:00Z

process_dir2_data() has special . and .. processing; it is able
to correct these inodes, so there is no reason to clear them.

Do this before we adjust a length 0 filename to length 1, so
that we don't take this action on an accidentally created "."
name from a hidden dotfile.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

V2: Move the new hunk up, before we possibly reset the namelen to 1;
a 0-length ".hidden" file could turn in a length-1 "." and not get
cleared.

diff --git a/repair/dir2.c b/repair/dir2.c
index 9e6c67d..8ecc29b 100644
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -1318,6 +1318,18 @@ _("entry \"%*.*s\" at block %d offset %" PRIdPTR " in directory inode %" PRIu64
dep->namelen, dep->namelen, dep->name,
da_bno, (intptr_t)ptr - (intptr_t)d, ino,
clearreason, ent_ino);
+
+ /*
+ * We have a special dot & dotdot fixer-upper below which can
+ * sort out the proper inode number, so don't clear it.
+ */
+ if ((dep->namelen == 1 && dep->name[0] == '.') ||
+ (dep->namelen == 2 &&
+ dep->name[0] == '.' && dep->name[1] == '.')) {
+ clearino = 0;
+ clearreason = NULL;
+ }
+
/*
* If the name length is 0 (illegal) make it 1 and blast
* the entry.