git: 94989248641a - main - p9fs: Remove the "cancel" transport method
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 24 Jun 2026 17:26:55 UTC
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=94989248641a17f5c2afc367df4845e4113779a1
commit 94989248641a17f5c2afc367df4845e4113779a1
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-06-24 16:54:20 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-06-24 17:26:39 +0000
p9fs: Remove the "cancel" transport method
Nothing calls it, and the existing virtio transport doesn't implement
it. No functional change intended.
MFC after: 1 week
---
sys/dev/virtio/p9fs/virtio_p9fs.c | 8 --------
sys/fs/p9fs/p9_transport.h | 2 --
2 files changed, 10 deletions(-)
diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c
index e5fef9e57f1d..7a5d703513c0 100644
--- a/sys/dev/virtio/p9fs/virtio_p9fs.c
+++ b/sys/dev/virtio/p9fs/virtio_p9fs.c
@@ -86,13 +86,6 @@ static struct virtio_feature_desc virtio_9p_feature_desc[] = {
VIRTIO_SIMPLE_PNPINFO(virtio_p9fs, VIRTIO_ID_9P, "VirtIO 9P Transport");
-/* We don't currently allow canceling of virtio requests */
-static int
-vt9p_cancel(void *handle, struct p9_req_t *req)
-{
- return (1);
-}
-
SYSCTL_NODE(_vfs, OID_AUTO, 9p, CTLFLAG_RW, 0, "9P File System Protocol");
/*
@@ -443,7 +436,6 @@ static struct p9_trans_module vt9p_trans = {
.create = vt9p_create,
.close = vt9p_close,
.request = vt9p_request,
- .cancel = vt9p_cancel,
};
static device_method_t vt9p_mthds[] = {
diff --git a/sys/fs/p9fs/p9_transport.h b/sys/fs/p9fs/p9_transport.h
index 143c29f2382e..f217f4f76cfd 100644
--- a/sys/fs/p9fs/p9_transport.h
+++ b/sys/fs/p9fs/p9_transport.h
@@ -42,8 +42,6 @@ struct p9_trans_module {
void (*close) (void *handle);
/* member function to issue a request to the transport*/
int (*request) (void *handle, struct p9_req_t *req);
- /* member function to cancel a request if it has been sent */
- int (*cancel) (void *handle, struct p9_req_t *req);
};
void p9_register_trans(struct p9_trans_module *m);