upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio_p9fs: Simplify vt9p_req_wait() a bit

Browse source 
Remove an always-false check for whether the request has already
completed before sleeping.  Even if the request is complete, the
response tag is updated while holding the channel lock, which is also
held here.

No functional change intended.

Sponsored by:	Klara, Inc.

(cherry picked from commit 28c9b13b236d25512cfe4e1902411ff421a14b64)
This commit is contained in:
Mark Johnston 2024-10-25 17:52:52 +00:00 committed by Franco Fichtner
parent af2a6e69d5
commit e6d0130a29
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sys/dev/virtio/p9fs/virtio_p9fs.c
View file

@ -110,20 +110,20 @@ SYSCTL_UINT(_vfs_9p, OID_AUTO, ackmaxidle, CTLFLAG_RW, &vt9p_ackmaxidle, 0,
static int
vt9p_req_wait(struct vt9p_softc *chan, struct p9_req_t *req)
{
if (req->tc->tag != req->rc->tag) {
if (msleep(req, VT9P_MTX(chan), 0, "chan lock",
vt9p_ackmaxidle * hz)) {
/*
* Waited for 120s. No response from host.
* Can't wait for ever..
*/
P9_DEBUG(ERROR, "Timeout after waiting %u seconds"
"for an ack from host\n", vt9p_ackmaxidle);
return (EIO);
}
KASSERT(req->tc->tag == req->rc->tag,
("Spurious event on p9 req"));
KASSERT(req->tc->tag != req->rc->tag,
("%s: request %p already completed", __func__, req));
if (msleep(req, VT9P_MTX(chan), 0, "chan lock", vt9p_ackmaxidle * hz)) {
/*
* Waited for 120s. No response from host.
* Can't wait for ever..
*/
P9_DEBUG(ERROR, "Timeout after waiting %u seconds"
"for an ack from host\n", vt9p_ackmaxidle);
return (EIO);
}
KASSERT(req->tc->tag == req->rc->tag,
("%s spurious event on request %p", __func__, req));
return (0);
}