From nobody Wed Jul 8 18:09:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gwR2Z3zPVz6kcqv for ; Wed, 08 Jul 2026 18:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gwR2Y733zz4CmJ for ; Wed, 08 Jul 2026 18:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783534198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzFrtczXyWYdVIzQPKfxvAQJWtW70H1W08f+DNQX+yE=; b=eeEHiD9G68NJ6aD3auQTfEYc9dFO5EKc7Mk2VONXy/niE8m73Zan39LMYYaGg8z7nVAv3T VlaGgoCl3CViac3oKAf3mL9O8Mb56pnHs7A2WFa8gx0aryhvYymCDNLyr2H1p880lYJgCC 7bngULVyO/Gy7cqXla3Haa/+MshaRGlXNFqH490EtQjRYuYw65X2izjmSoqv6TaZobVU1W 9HCYmai3vQIVVkM1g4VywkbRYo2uIUuYAL2sV74q0xIhhCnTEMTJBk0Iy7j2Vw26IDNQN3 HZrYujzequ/Fd5znldnOGM6w7l9FamW08NLdhCABbFGeDwtjNZgn+otLUofRRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783534198; a=rsa-sha256; cv=none; b=kK51iQFA/WBna6cGq3VISsbokp8SQa02hvdYqrlFblK6zXrarl5g9vqL4+iZ2FVKJPg97h i/NHRBxPkEE9tSHlJObxlrvxVb/Jtyxap2A7DRQ3FN9Hw+UqFJZPFmBKlsRZorMkVU6Vx8 lsc/GpuLMpi7ECu7GdUWVmh5zfnBr8dvzFW/gsgt4m6NsM3uV50R58ht65cOgpMSz7kZvC Q4IrRJKIdVHOXBlIF8xZSDC6kFwh2C/f6xWIJSpAe5vUBEJDmbm0qbPNxYuFX0JniKn2Y7 6ORAXO0EO00//NNa2JiHsltRjOW5mzIxgzLLWt6GPHSBLt0jpGIkKUIQuecUrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783534198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzFrtczXyWYdVIzQPKfxvAQJWtW70H1W08f+DNQX+yE=; b=FZS5IpjlZOUsBP4GwFB1TdiBPbarbDwOuO3NuaO7IjVfX4G249sge7U+Z9lZWGgi5rj+7i c6rVILmSwiP1MxPWgxu1XMZbOYuCPtFqWp3wzZD37MPrkwGz+7cbrV1TV5h8H/pBAKapuC +UmghQTW4f1aJ1RpBWWsGXea7nLC9JZTTqaa2IjVrZKoNH5yL6ieGdC7qIQq+/KbEgMUOg 4cP4d0IKO+0X3U05IGEu15hoKInbX/UnAVD6cnfey1v0f1JGQceqBcEdgrIRc3Am2YewSq 8VUs4E9wsE0CFE8cJXPY4TjTE0W+7xw4BV12aLjEiPPfEo0eBABkjwUCkfV6uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwR2Y5WXqzYkv for ; Wed, 08 Jul 2026 18:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ac8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Jul 2026 18:09:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bfcac89d989a - stable/15 - p9fs: Remove the "cancel" transport method List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bfcac89d989a9153637da3899849f9237a346c2d Auto-Submitted: auto-generated Date: Wed, 08 Jul 2026 18:09:57 +0000 Message-Id: <6a4e9275.38ac8.455d4da3@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bfcac89d989a9153637da3899849f9237a346c2d commit bfcac89d989a9153637da3899849f9237a346c2d Author: Mark Johnston AuthorDate: 2026-06-24 16:54:20 +0000 Commit: Mark Johnston CommitDate: 2026-07-08 18:09:35 +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 (cherry picked from commit 94989248641a17f5c2afc367df4845e4113779a1) --- 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 2b276a60aa9a..f612a36b66aa 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);