From nobody Tue Oct 28 02:58:15 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 4cwZnM32PGz6CjG4; Tue, 28 Oct 2025 02:58:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwZnM2Kr5z3f5J; Tue, 28 Oct 2025 02:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761620295; 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=RSfIcUv2lZsgy63NLBBcLRDL3fbNdle3CBftD3rG+xE=; b=BnqBrwmBbBktvxvLpOwucRTgDYh74wiJCEoLMNPMBe9JNgLhw1hX8gO+O3nO2OKy5zIIV4 /rWQig+bFD3t1/6qSHu52WH59JNv3TGKqUy4HPNnghjerv5cilpMlhWjx2S+mbXIV/1L2r ErlH6IXTyOYlhQxbYCAmzA0MWjpy3MCkrhpOmrsjDF2wAgGVPOBuc/1ljvEJIDOTAdBigq UjUvYVR3ruPpy6VO8pw+L/oECI7tAk2mHh0vnrGZQ2QcrtxvCQFEzLsqn1ytOYtWgv3uS3 IO9l/PGt348uzrWR2wdt5Frz5zkh/mnLkDqrO8zSNvygxB1tuLO9Js9qf0dMFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761620295; 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=RSfIcUv2lZsgy63NLBBcLRDL3fbNdle3CBftD3rG+xE=; b=pjx940aqiHSzW/atr8LwDB0U3S+rsc5OnDhE5wIrpCnFxxQCuepVVyBaYyaduF/wHs4gkd otb4af4kshOgEE9O6CVZF33BxTvWAC5eS3Z2deBOLEUNwXlt/ISnbLcso/1tzIC+KfoPOM nSeDMIkkhAPmh2MXGxD31oJx0dG421kMFJbDtOP8DCmYWAFwQsrESA4DrOHhRW/6UItxOi De7RBu58hZPVjDel7cgR7baQ65BDXRDu6NwwSiWUkNYBDPQhqKK9w65mpI+WxSjmotOhBX IBS+q3/QicRCh9nJVJ0UtUPJcE3oBrzRjDtJLioiAxl6PfoqRZUpv+hNluuImg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761620295; a=rsa-sha256; cv=none; b=uRiXDXe6dEGzzRl7RHHtSJbynEYPn2wksJps2ugbi5uoWz9rTHw8mCKWyXNPJPkFdMLOAl 6CLxuCtyNHKZESfmjlgZcKIqn7a7tVauUBBA175+qFlpBA6H0kB/vg2uhZgo7dkWVanP7i Os6h5ApGP7tnaDTb8pfnIlFi/f4vYRuhrxnRIzN3kozHpLFlSga2G66DV/ZhUAENEm849R pD3jEuVKuRU438sHKAsMk4fhQyQzx7lBspr/tnuByeh2oS8jKvhcX5M1lzzTtilIhlr7rr mbTdNLOtasix41VCZIeF7vfX82HMDSR+HEzTaA15nxuEGJvVBSegPip1w0LqOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwZnM1tyfzXXR; Tue, 28 Oct 2025 02:58:15 +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 59S2wFKW084783; Tue, 28 Oct 2025 02:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S2wFXt084780; Tue, 28 Oct 2025 02:58:15 GMT (envelope-from git) Date: Tue, 28 Oct 2025 02:58:15 GMT Message-Id: <202510280258.59S2wFXt084780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 74a6de9f9625 - releng/15.0 - deadfs: Return ENXIO instead of EIO when the device is gone. 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 74a6de9f962506fa5d8b75aad0d664c3c164143d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=74a6de9f962506fa5d8b75aad0d664c3c164143d commit 74a6de9f962506fa5d8b75aad0d664c3c164143d Author: Poul-Henning Kamp AuthorDate: 2025-10-24 07:19:31 +0000 Commit: Colin Percival CommitDate: 2025-10-28 02:58:00 +0000 deadfs: Return ENXIO instead of EIO when the device is gone. One some systems, under some conditions, pulling a USB stick would read(2) returning EIO and not ENXIO, like it should and used to. Recoverdisk(1), which does not give up on EIO, like most programs would, spins furiously. Arguably, deadfs was always wrong in returning EIO, because once you get to deadfs no operation will ever work again, but we used to take a different path through devfs_vnops.c which got us the ENXIO. Something changed recently, and while testing this fix, I noticed that drm-kmod-66/i915kms may be the condition which trigger the different code-path. Approved by: re (cperciva) MFC to: stable/15 Fixes: 289785 Thanks to: imp, kib (cherry picked from commit 2612f1b8649bb4f069a6a064ed714daa5f10d037) (cherry picked from commit 44e214f8241faa224e2346a5a03db8c029a7d4af) --- sys/fs/deadfs/dead_vnops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index 296cf058f8c9..137c86b65058 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -122,18 +122,18 @@ dead_read(struct vop_read_args *ap) { /* - * Return EOF for tty devices, EIO for others + * Return EOF for tty devices, ENXIO for others */ - if ((ap->a_vp->v_vflag & VV_ISTTY) == 0) - return (EIO); - return (0); + if (ap->a_vp->v_vflag & VV_ISTTY) + return (0); + return (ENXIO); } int dead_write(struct vop_write_args *ap) { - return (EIO); + return (ENXIO); } int