From nobody Wed Jun 24 17:26:55 2026 X-Original-To: dev-commits-src-main@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 4glplN1Rgyz6jX5D for ; Wed, 24 Jun 2026 17:26:56 +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 4glplM5glzz3XbK for ; Wed, 24 Jun 2026 17:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782322015; 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=wtKnXozKG44rp8H6MohkNnGhgu+MhJJKCEngCv1YNHA=; b=rJ74nMC2njkFXJfKLLm+nqgK262vsrZ9b4BSzoZbaAU5PNq99KTP4mviaSIqapuVob3Mi+ SfdSYOAX5sjxfNP/yiwM1v7fRgCWRWja3UQrX0j5U93WB31mvlipJ6/mGIuR/qSxOBsb0d TYTQmVaC3mbMhieyb3yet80buFi6rg3aNyOEzrPhZNUKafwAbKbe7m9ezrqKckGgApoO5f WtYK9OjWnQrG+Z76yiJeGlMmfsQl7vxG+l39aBdiWbwyQkY0k6plL//r12cmzTyAn6ZMMq 2ghEw/HutTMqbhkxrSe2vnAgUO2xpm3DpuqUTPVYi3uJEjht4YG0ZNtlX1XYCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782322015; a=rsa-sha256; cv=none; b=bRDyozv1oeb5+wmjEvI5HJiWRRBnDZg5uJIRz5ePHZj148Jf/0SyzdXNNHZJ2TJl6kUXM9 m+6dL2z+i0ofJZC8ql1wE3kUFAcnghydhTGNbjT7A5XfZ8Tazt6yts3JbzUWWzPx9r7sNO YMtHEkXHLjZiI8zfxcwXcjokXBlUsRVq+TCOILagWKLTG+waoyn93shbe7jPxxO2j7yu/s YGK8GybnZPvQqwhyJcVWP49DyY9SGK3o4VTFljuJo+D6M1L16ojJ+XU44bwtDuUnKrynL6 CV/MYrBOnFT0zDPFUSOVGiuVJdJEnr7aUIm/lctAhoZ2Md4gglDE9L81MOQevw== 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=1782322015; 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=wtKnXozKG44rp8H6MohkNnGhgu+MhJJKCEngCv1YNHA=; b=njLI/sXDMJe6XOTuhJle81tCvry+/WqjFD+2SxJtvkJizTo72L5P82Ens+50t7Ug0GrVAd eYFmEMI/xPaUzzX5jBQf/ZLmQR/o8aJV5DCa4vQIr66Gwms1/mKrIIQN8QacOARZfeMsPe YeOsXYqjVNvPWpMnO9NxJpEvsBmrKhyVfTtPRdtgm9C9N/Qw9KTEZiaNTNho2l7F3VtfAD QJIi4xmhxviiDhc8eVN82r8VcZdiRLVxLIL8Pj8vsj4VlcYkScCUK2F0v6S9cchnjZzry8 XGiSDLWpkHH0acXo/Kv3igUD25qW4oDSD/U7rHSREvbFLayatpxfxDhlJ+peLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glplM4RR6zTdX for ; Wed, 24 Jun 2026 17:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37052 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 17:26:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 94989248641a - main - p9fs: Remove the "cancel" transport method List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 94989248641a17f5c2afc367df4845e4113779a1 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 17:26:55 +0000 Message-Id: <6a3c135f.37052.3d273cca@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=94989248641a17f5c2afc367df4845e4113779a1 commit 94989248641a17f5c2afc367df4845e4113779a1 Author: Mark Johnston AuthorDate: 2026-06-24 16:54:20 +0000 Commit: Mark Johnston 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);