From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Greg Kurz <groug@kaod.org>
Subject: [PULL 6/8] 9pfs: replace not_same_qid() by same_stat_id()
Date: Mon, 05 Jul 2021 13:13:51 +0200 [thread overview]
Message-ID: <f22cad42281621f86a0756a7cff382f90a33ec8c.1625483630.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1625483630.git.qemu_oss@crudebyte.com>
As we are actually only comparing the filesystem ID (i.e. device number
and inode number pair) let's use the POSIX stat buffer instead of QIDs,
because resolving QIDs requires to be done on 9p server's main thread
only as it might mutate the server state if inode remapping is enabled.
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <26aa465ff9cc9c07e053331554a02fdae3994417.1622821729.git.qemu_oss@crudebyte.com>
---
hw/9pfs/9p.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 0e3857798d..47b000d3a9 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1696,9 +1696,9 @@ static bool name_is_illegal(const char *name)
return !*name || strchr(name, '/') != NULL;
}
-static bool not_same_qid(const V9fsQID *qid1, const V9fsQID *qid2)
+static bool same_stat_id(const struct stat *a, const struct stat *b)
{
- return qid1->path != qid2->path;
+ return a->st_dev == b->st_dev && a->st_ino == b->st_ino;
}
static void coroutine_fn v9fs_walk(void *opaque)
@@ -1771,7 +1771,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
v9fs_path_copy(&dpath, &fidp->path);
v9fs_path_copy(&path, &fidp->path);
for (name_idx = 0; name_idx < nwnames; name_idx++) {
- if (not_same_qid(&pdu->s->root_qid, &qid) ||
+ if (!same_stat_id(&pdu->s->root_st, &stbuf) ||
strcmp("..", wnames[name_idx].data)) {
err = v9fs_co_name_to_path(pdu, &dpath, wnames[name_idx].data,
&path);
--
2.20.1
next prev parent reply other threads:[~2021-07-05 11:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 11:13 [PULL 0/8] 9p queue 2021-07-05 Christian Schoenebeck
2021-07-05 11:13 ` [PULL 8/8] 9pfs: reduce latency of Twalk Christian Schoenebeck
2021-07-05 11:13 ` [PULL 4/8] 9pfs: capture root stat Christian Schoenebeck
2021-07-05 11:13 ` [PULL 3/8] 9pfs: fix not_same_qid() Christian Schoenebeck
2021-07-05 11:13 ` [PULL 7/8] 9pfs: drop root_qid Christian Schoenebeck
2021-07-05 11:13 ` [PULL 1/8] 9pfs: add link to 9p developer docs Christian Schoenebeck
2021-07-05 11:13 ` Christian Schoenebeck [this message]
2021-07-05 11:13 ` [PULL 5/8] 9pfs: drop fid_to_qid() Christian Schoenebeck
2021-07-05 11:13 ` [PULL 2/8] 9pfs: simplify v9fs_walk() Christian Schoenebeck
2021-07-05 13:57 ` [PULL 0/8] 9p queue 2021-07-05 Peter Maydell
2021-07-05 15:34 ` Christian Schoenebeck
2021-07-05 19:03 ` Peter Maydell
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=f22cad42281621f86a0756a7cff382f90a33ec8c.1625483630.git.qemu_oss@crudebyte.com \
--to=qemu_oss@crudebyte.com \
--cc=groug@kaod.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).