From nobody Wed Jul 23 22:58:54 2025 X-Original-To: dev-commits-src-branches@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 4bnV1W5cj4z636C8; Wed, 23 Jul 2025 22:58:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnV1V6zxJz3LNK; Wed, 23 Jul 2025 22:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753311535; 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=3ds3hUvOZ6mGb+2sOzQlQNVxR+UCOzVj1bBwEbf4alU=; b=oTCibKPUwbwpgpqTtt0hgUvkOKZh7qPVs5p+rF66T19lak+TOyPGeaQ4Oda1AGTDiJmLjH o2rKZoRYzoBwQAYuWsbDgoXu3GrXRQJdc/+qAkKZfGN0QbDEdsaVtmAX1+zijJXhpABRQR LWcffZp11vlLHp4/Qo35m7aRLw800iaS6VM8LI63TkhCF+rEwNBaU93jkggKi4GbJaVjU8 psDwZ7PWxmK2WQhmCuHqrGI1kxMCXjdIcBAif/atKHRlztA4S1DP6YX+/mQ8WoBYyI7Ki1 Rpv81N2pC5lpr7Sb/s++ut1Hv/l4CLawHZPfKYBWEdwVgr7p3YN5m5JWAbWxZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753311535; 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=3ds3hUvOZ6mGb+2sOzQlQNVxR+UCOzVj1bBwEbf4alU=; b=n7HeXxaSIXco2NuVrhQjXWhqI6kJ52SUs8N7Ax4fbQ/+RINA+ijQhgfSuszYLZ496Ms6m1 Iw0vfRun1X5FWBmLBluv6zC9+5QuNDUsyzfy8BUcri3MC2v3QXvAovvXkUYBM3SwJQ0XO1 Gbw50/CMn8OpykmV+YNPNgAPMR5XhIAuA3A8VRvgjR2ykU11BrK1paQBjaY3NFfHVJwdwS EEGKnA+GfujDT36m0Tri8Bpj2jQ6ojE7jJR4jp0owD4XBZJa9IXGB/W4n+T+5Xa46yWEhE rvBtzaBG03++x4xvJ2Zwsik+bZWFL4NcK+tLGeEhKGjSOXVmm5/CX0ou5Y/lIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753311535; a=rsa-sha256; cv=none; b=v1XsxfZgjR/YlXroHRxqAOKi4cj4W2EH1KRLiwZrN9t/I6BtMx0z7nMFN03BO9Laj77GOe QDo6CzABuWXm11qY1xJmm/lHW/go8KGwuw57KlrdlX3eyvbhw0FRKU4y9/uqFzzaUTuYgP 4URBlA2dFXZq5YEgG4Pw6wfhxFvMdMfZZPJQ5fv4ioR+4WEM8WDQU5LGaP5lK8svKC2Yul 47rBQJgcSUAAV18zAtBbSwI1uj1h+bqWTr9BhI0PnMXFuAtKE7YPGrARETJQWOX2zKKdPe +ekoTDipJ8YH6PyeaG9rpQok3PsLhy50zz/ofOUdrQaA+BR33IJafnR6LFviEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bnV1V6Y4nzYsx; Wed, 23 Jul 2025 22:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56NMwsRi094942; Wed, 23 Jul 2025 22:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NMws1I094939; Wed, 23 Jul 2025 22:58:54 GMT (envelope-from git) Date: Wed, 23 Jul 2025 22:58:54 GMT Message-Id: <202507232258.56NMws1I094939@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 0a0d323157cb - stable/14 - fusefs: delete dead code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a0d323157cb54970b5c525db307c17c2e7ff864 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=0a0d323157cb54970b5c525db307c17c2e7ff864 commit 0a0d323157cb54970b5c525db307c17c2e7ff864 Author: Alan Somers AuthorDate: 2025-06-05 20:32:22 +0000 Commit: Alan Somers CommitDate: 2025-07-23 22:56:33 +0000 fusefs: delete dead code These lines have been commented out ever since the first import of fuse. The intention seems to be for the original developer to experiment with different error handling strategies, but they're very obsolete by now. Delete them. MFC after: 2 weeks Sponsored by: ConnectWise (cherry picked from commit 7ce93195ddb30b371022ae3adbd9bd24189e1444) --- sys/fs/fuse/fuse_ipc.c | 5 ----- sys/fs/fuse/fuse_vnops.c | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c index 21787b6b543a..379306f8ef2e 100644 --- a/sys/fs/fuse/fuse_ipc.c +++ b/sys/fs/fuse/fuse_ipc.c @@ -444,11 +444,6 @@ retry: if (err == EWOULDBLOCK) { SDT_PROBE2(fusefs, , ipc, trace, 3, "fticket_wait_answer: EWOULDBLOCK"); -#ifdef XXXIP /* die conditionally */ - if (!fdata_get_dead(data)) { - fdata_set_dead(data); - } -#endif err = ETIMEDOUT; fticket_set_answered(ftick); } else if ((err == EINTR || err == ERESTART)) { diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 423ce05a595f..88bf20382c05 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1937,10 +1937,8 @@ fuse_vnop_readdir(struct vop_readdir_args *ap) if (fuse_isdeadfs(vp)) { return ENXIO; } - if ( /* XXXIP ((uio_iovcnt(uio) > 1)) || */ - (uio_resid(uio) < sizeof(struct dirent))) { + if (uio_resid(uio) < sizeof(struct dirent)) return EINVAL; - } tresid = uio->uio_resid; err = fuse_filehandle_get_dir(vp, &fufh, cred, pid);