From: "Darrick J. Wong" <djwong@kernel.org>
To: sandeen@sandeen.net, djwong@kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 4/4] xfs_scrub: handle concurrent directory updates during name scan
Date: Fri, 15 Jan 2021 17:25:36 -0800 [thread overview]
Message-ID: <161076033640.3386689.11320451390779411930.stgit@magnolia> (raw)
In-Reply-To: <161076031261.3386689.3320804567045193864.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
The name scanner in xfs_scrub cannot lock a namespace (dirent or xattr)
and the kernel does not provide a stable cursor interface, which means
that we can see the same byte sequence multiple times during a scan.
This isn't a confusing name error since the kernel enforces uniqueness
on the byte sequence, so all we need to do here is update the old entry.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
scrub/unicrash.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/scrub/unicrash.c b/scrub/unicrash.c
index de3217c2..cb0880c1 100644
--- a/scrub/unicrash.c
+++ b/scrub/unicrash.c
@@ -68,7 +68,7 @@ struct name_entry {
xfs_ino_t ino;
- /* Raw UTF8 name */
+ /* Raw dirent name */
size_t namelen;
char name[0];
};
@@ -627,6 +627,20 @@ unicrash_add(
uc->buckets[bucket] = new_entry;
while (entry != NULL) {
+ /*
+ * If we see the same byte sequence then someone's modifying
+ * the namespace while we're scanning it. Update the existing
+ * entry's inode mapping and erase the new entry from existence.
+ */
+ if (new_entry->namelen == entry->namelen &&
+ !memcmp(new_entry->name, entry->name, entry->namelen)) {
+ entry->ino = new_entry->ino;
+ uc->buckets[bucket] = new_entry->next;
+ name_entry_free(new_entry);
+ *badflags = 0;
+ return;
+ }
+
/* Same normalization? */
if (new_entry->normstrlen == entry->normstrlen &&
!u_strcmp(new_entry->normstr, entry->normstr) &&
next prev parent reply other threads:[~2021-01-16 1:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-16 1:25 [PATCHSET v2 0/4] various: random fixes Darrick J. Wong
2021-01-16 1:25 ` [PATCH 1/4] misc: fix valgrind complaints Darrick J. Wong
2021-01-18 4:33 ` Chandan Babu R
2021-01-19 2:55 ` Chaitanya Kulkarni
2021-01-16 1:25 ` [PATCH 2/4] xfs_scrub: detect infinite loops when scanning inodes Darrick J. Wong
2021-01-18 4:57 ` Chandan Babu R
2021-01-16 1:25 ` [PATCH 3/4] xfs_scrub: load and unload libicu properly Darrick J. Wong
2021-01-18 4:45 ` Chandan Babu R
2021-01-18 19:19 ` [PATCH v2.1 " Darrick J. Wong
2021-01-16 1:25 ` Darrick J. Wong [this message]
2021-01-18 4:47 ` [PATCH 4/4] xfs_scrub: handle concurrent directory updates during name scan Chandan Babu R
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161076033640.3386689.11320451390779411930.stgit@magnolia \
--to=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).