From nobody Thu Jun 5 21:30:19 2025 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 4bCyKR2jLQz5yPjG; Thu, 05 Jun 2025 21:30:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCyKR1Jpzz3F09; Thu, 05 Jun 2025 21:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749159019; 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=5wRSkFsNBUBvGzIDpAf496B+CCu4z0OypZQKzG8Pl98=; b=nB0kinRx4tx/upHoJ8+tEbNhHb7Eo9VW8Jljk+QNheFAIQgyB8cHhEtL/RzvdR5zzEUsWg KhAFXecigfDdKucHe23oqzVmnIfcCwAVxweOQxFY8UMeWbmTtjhkKgUbnwwaS77zQx/Gl8 g1jbYx3iejD2tW3GiYqs9BwOvdBDVL/tyvqMWjwa6s2uQVpU8/OLNNBRHQRGbg7lrgKicK OBjah3Lj1OnpHwtpIexSPbY/A13WnSKHnwraoNezY7HsaQTa5oOE6KuLwEiEHj6DM8nX68 Oo8CfHaPdKLtPuj7kEIcClFZUiaIC68bVIjTscgv/u4jJXG9DE2XfHxUAGTStw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749159019; 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=5wRSkFsNBUBvGzIDpAf496B+CCu4z0OypZQKzG8Pl98=; b=yNfVWVqXh5zoniE+qMB9AfPqlfe8XO4rvwfcKc/0kqqDx4QwlDkUyQMCVNiaDuTMAZy5F+ 2ivs8CBF+tVehbTD2Wu0SuvJlPXmUIr3uOq9H/PxuLloCpMzn/Zi3c0Btck2aQQuqbYNR+ D5rFA+d2LGY7KOZyw32yvl52XPVzKeTnDWjYEQgq7HaWqGUrQ+o9PNI+EvXE6xgNcNyVwC 2q6x9hgPaJGCJGlf8dEzRmuoKva2m1qrKpp6LkpkuWouJzj2ylB0Zg8m+mKRdVnr9IQCGh U797ZAmuqTfrPhz+0JsTfB24IYdFU43a45xQsnyeC1jEltxts3d9piyV+YlQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749159019; a=rsa-sha256; cv=none; b=eDoBS+TJk+/u/4cc8ds2s8bFRMPnd42+W/RHMHN9rgenudhcvC1f7T+expd7FLrOtTbY3w 0t0unVaIpbIqK28/hcsETbSaHPYvew643niu2II0z3l1GOeO2Hptomkp6EwUbApyXRQ8c8 beO+1uO4MNf4VYPe0BZt1tiqQNtb7W7NZ7vT2Q32096pKvoSIeKSU15lnQabMJ1lFVd7aT ToaS/pz+GNFl7JlBn1x7CfanckcJQo83g9hHJK46age4GcZNUJIM4uClPcXfnSgH6/Bnew 0W60sT+E/LK6tjJXgaLuCaInyDfwVm8c0PnxPYAjvuGh/RTH2DzA5pWXhO+BMA== 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 4bCyKR0sn2zBK3; Thu, 05 Jun 2025 21:30:19 +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 555LUJ8c036694; Thu, 5 Jun 2025 21:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555LUJTq036691; Thu, 5 Jun 2025 21:30:19 GMT (envelope-from git) Date: Thu, 5 Jun 2025 21:30:19 GMT Message-Id: <202506052130.555LUJTq036691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7ce93195ddb3 - main - fusefs: delete dead code 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 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/main X-Git-Reftype: branch X-Git-Commit: 7ce93195ddb30b371022ae3adbd9bd24189e1444 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7ce93195ddb30b371022ae3adbd9bd24189e1444 commit 7ce93195ddb30b371022ae3adbd9bd24189e1444 Author: Alan Somers AuthorDate: 2025-06-05 20:32:22 +0000 Commit: Alan Somers CommitDate: 2025-06-05 21:17:53 +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 --- 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 f1f9f801bf4d..d3536e0a2a61 100644 --- a/sys/fs/fuse/fuse_ipc.c +++ b/sys/fs/fuse/fuse_ipc.c @@ -443,11 +443,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 83f527ec8ec0..d09d86e4f3a1 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1936,10 +1936,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);