Skip to contentSkip to conversation

xfs_repair: invalidate dirhash entry when junking dirent

PATCH In review Darrick J. Wong 2 participants 2 messages Jul 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs_repair: invalidate dirhash entry when junking dirent

From: Darrick J. Wong <[email protected]>

In longform_dir2_entry_check_data, we add the directory entries we find to the incore dirent hash table after we've validated the name but before we're totally done checking the entry. This sequence is necessary to detect all duplicated names in the directory.

Unfortunately, if we later decide to junk the ondisk dirent, we neglect to mark the dirhash entry, so if the directory gets rebuilt, it will get rebuilt with the entry that we rejected.

---
 repair/phase6.c |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
repair/phase6.c +18 -0
index 29259b38..84092269 100644
@@ -237,6 +237,21 @@ dir_hash_add(
 	return !dup;
 }
 
+/* Mark an existing directory hashtable entry as junk. */
+static void
+dir_hash_junkit(
+	struct dir_hash_tab	*hashtab,
+	xfs_dir2_dataptr_t	addr)
+{
+	struct dir_hash_ent	*p;
+
+	p = radix_tree_lookup(&hashtab->byaddr, addr);
+	assert(p != NULL);
+
+	p->junkit = 1;
+	p->namebuf[0] = '/';
+}
+
 static int
 dir_hash_check(
 	struct dir_hash_tab	*hashtab,
@@ -2009,6 +2024,7 @@ longform_dir2_entry_check_data(
 				if (entry_junked(
 	_("entry \"%s\" (ino %" PRIu64 ") in dir %" PRIu64 " is not in the the first block"), fname,
 						inum, ip->i_ino)) {
+					dir_hash_junkit(hashtab, addr);
 					dep->name[0] = '/';
 					libxfs_dir2_data_log_entry(&da, bp, dep);
 				}
@@ -2036,6 +2052,7 @@ longform_dir2_entry_check_data(
 				if (entry_junked(
 	_("entry \"%s\" in dir %" PRIu64 " is not the first entry"),
 						fname, inum, ip->i_ino)) {
+					dir_hash_junkit(hashtab, addr);
 					dep->name[0] = '/';
 					libxfs_dir2_data_log_entry(&da, bp, dep);
 				}
@@ -2124,6 +2141,7 @@ _("entry \"%s\" in dir inode %" PRIu64 " inconsistent with .. value (%" PRIu64 "
 				orphanage_ino = 0;
 			nbad++;
 			if (!no_modify)  {
+				dir_hash_junkit(hashtab, addr);
 				dep->name[0] = '/';
 				libxfs_dir2_data_log_entry(&da, bp, dep);
 				if (verbose)
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

In longform_dir2_entry_check_data, we add the directory entries we find to the incore dirent hash table after we've validated the name but before we're totally done checking the entry. This sequence is necessary to detect all duplicated names in the directory.

Quoted 5 lines

Unfortunately, if we later decide to junk the ondisk dirent, we neglect to mark the dirhash entry, so if the directory gets rebuilt, it will get rebuilt with the entry that we rejected.

Makes sense.

Signature · 2 lines
Dave Chinner
[email protected]