From nobody Tue Jan 20 17:15:03 2026 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 4dwYqC6dL5z6NqYL for ; Tue, 20 Jan 2026 17:15:03 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwYqC5hM5z3XjX for ; Tue, 20 Jan 2026 17:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929303; 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=iJw4blFNK9P/Nm77NDyzObCd790cT+Hbjk0FQomjfwM=; b=IOkQtwjod2uDN2EVfn9KltQ6POBtSe3WMZxF6Hhjqw/rog47RRwRxt14VLd4A+1kLtbmAm 4OmTWSndQMS5oYQB5iL6Hz82nwONnIHoTy6IRzpLN+xpRpf8X81CHXkMrkGSm3SzUGY8H+ TA4+bLKz/aq2VMkpWpBJpCV5xiJjeIKHLcB0YSeiJpTKreQl0f3NEaFubu25Rdj36/wX8R ewQ5vS39PkQw7B8pggJVG1c/sDy9YWVV9AyNyxy+u6//BIKLQ9I4gKkw0U9xldLb9pncw5 89coyECI5CIe83qjFJ2ezQh2EqQqK8gOybPewz1sNQ7dCtzCuGL16w0u3qv+IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929303; 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=iJw4blFNK9P/Nm77NDyzObCd790cT+Hbjk0FQomjfwM=; b=g2Q6HZolssVk8mmvVfu5ZfHACjFalpotm0ydaWeZ7Gz1PjwaUghPISlbrHD+KjcXVn0H79 OX10gE+/Ohb4EB+YctF9bk2wXp34zwuS8Vdq1NdifsmRObjI+sqyOltMlMI9g4vWecX3VE exftiUocR1yKlXIABwRVHcW9V7mpI7jslfaXHqmSHPUuToNE2uAyzY/SwAoNkwxD6wTcqf /kZ3En574SLg+vDeJG4u92XJw5v/Y3jqopncEdvYcB77mDc1aw0HpaxtloOd6h9PkytwGG AtkssMbFTQ36thSeihH3HTOZP56Etdb9G9Y6yYxKJe2nWO43nmijBGWDMEFLvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929303; a=rsa-sha256; cv=none; b=FJ67fvQGkgQJo+qznM9ZZjFBcAzz4ANfpyI/IAYfbM//muN568e3FOEGnj1tQTqpg90mJ9 7Qj2x0pu+Uae9RstT9UY+uPHM4GCcrugmkUeHBjzAeX1h7XuTM24lF8Ewg497EX8ocNCjh Y7CBqepTxvssaT5rOG/4WsnivJ6lvTEyB0hWBu79ZZPKhpSxx1ZsIECoJUoVc9LQJPlW7L mKCW3NPqDvvQ11ZInP3GhBriMP+Vmv6LJn9LbrEobXrL1QKPX54U/Es0yxyW/DJmKe74Jq jmYgDzkX4mnNjEZtRvq7LNLdLeTGTmb0WY1K3S4wpbNjjghoL+RVJSv3w7brjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwYqC5DfSz1PSh for ; Tue, 20 Jan 2026 17:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 355cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:15:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3b5c296fa151 - stable/14 - fusefs: Fix further intermittency in the BadServer.ShortWrite test case 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: 3b5c296fa1519a7fbfb8c48703bcacadd4b7d9c0 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:15:03 +0000 Message-Id: <696fb817.355cd.6b4fa95@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3b5c296fa1519a7fbfb8c48703bcacadd4b7d9c0 commit 3b5c296fa1519a7fbfb8c48703bcacadd4b7d9c0 Author: Alan Somers AuthorDate: 2025-12-21 15:32:31 +0000 Commit: Alan Somers CommitDate: 2026-01-20 17:14:21 +0000 fusefs: Fix further intermittency in the BadServer.ShortWrite test case After being unmounted, the mockfs server would occasionally read from /dev/fuse again, if the main function didn't exit fast enough, getting an ENODEV error. Handle that appropriately. Reported by: Siva Mahadevan Fixes: d86025c1d49c84c4dc8c3635c83c078ad56e5a53 Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D54331 (cherry picked from commit f51e9d0e0988df58c94db586ab5c8b5fd091c004) --- tests/sys/fs/fusefs/mockfs.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 74458d7ca4cd..ba4c3381eff2 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -981,7 +981,11 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { + if (res < 0 && errno == ENODEV && m_expect_unmount) { + /* The kernel unmounted us, as expected. */ + m_quit = true; + } + if (res < 0 && errno != EBADF && !m_quit) { m_quit = true; FAIL() << "read: " << strerror(errno); }