From nobody Mon Dec 22 17:18:32 2025 X-Original-To: dev-commits-src-all@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 4dZlGc2Ljnz6LVyZ for ; Mon, 22 Dec 2025 17:18:32 +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 4dZlGc1l9nz3hSc for ; Mon, 22 Dec 2025 17:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766423912; 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=Yt1Mcl5r5HvZfxDKUuWlwofkoR3PEXRw+jXeoWk4R7c=; b=HVmhbbEb8Ue9q5QsNkwpE3BDulEdc9tVwHXKpnr3lerRk9+bzbAYy/UlsXYwNuydp3G//5 YevZ1peW4Q5MCxG/nZbYqjbdZwhugVqcuQEv/FA2EcRsBHpvD8QoppSOturLZBGo5uoZqk rgYllbkyAugWFR4SjzYCexDHPZnYiz4odtUMHe1U9XVURgEAHNpi7HafyMVJC7IaJBB8o8 UmBNM/ZBbezKhMDohW03ugqaS6dfAx/F/Yurdxqo7Vw58iLogrSA5f4mZFjsvVSecXR2ln rU1WUjnV6+caAU6pJSojrkBVA0dUeCsfPyW9ZDAUIprwdpHu8ItvABXPCUz4rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766423912; 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=Yt1Mcl5r5HvZfxDKUuWlwofkoR3PEXRw+jXeoWk4R7c=; b=E6t/ltgMTA8NOyBhDPe6n31bzzIxJkBQsUHLF8BuaqoLKl89086DkqrYKt3hy5PKuIZckf cQkmqmClwlAHVrm7p6Ws3NV9+6pOrtPxAwJiYwQvUJSRjLkKwGB5dfTFGCf6naEzEUcmdx pQZYjk4bGwVOlhowTc89+xFx4smgPYgEknqkZC3ntZr3dLFxPweR2nbXnDu19atxGq9x3+ JcgKAJ1uAE7kmCH/tt9OIc5M/QC5kVqz6k1KfJN8pIrZJ+4EN/bb3P9yBddJKTldA0nEJs czhkrSvcwdMiWvxXsrh1zRFI+ABhlD1uVtbxu3Vh4R8D5oorPQRTdn58w8YQKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766423912; a=rsa-sha256; cv=none; b=TdDOdak2+dWHCWCVD3WSVuF9adFWGlGsMFm9o+NMVQeVQpt2o4h7Sxpt7kovm4RH13YNF8 K30z/FvfJH82CajpMBHGYyZuM/vbtt8bfWf3pcy/8fBoIHSRqVtRZJqp/PfjrUVW/TE0dg GF2AtZIUxb3ssGeQNnOx/cZ19/pdY25iXX0G9y1VwM+0ktY0bKnPLbjSKqrWlQ3xblp1f7 i2ZEOhG+M1VbRYlvAnhmkEG0GbgW0yXgVXfx7F9jGDxCx8awJSf2mjiTfI39g2CmQNZ1dD CpJHgAvzfjMRCzFY7V1bSbCCzGJAya0DRETV9C6ODEtU7tlAYsNDE1hhCn/rCg== 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 4dZlGc0rwJzc4s for ; Mon, 22 Dec 2025 17:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f60e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 17:18:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: f51e9d0e0988 - main - fusefs: Fix further intermittency in the BadServer.ShortWrite test case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f51e9d0e0988df58c94db586ab5c8b5fd091c004 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 17:18:32 +0000 Message-Id: <69497d68.f60e.67ff85e1@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f51e9d0e0988df58c94db586ab5c8b5fd091c004 commit f51e9d0e0988df58c94db586ab5c8b5fd091c004 Author: Alan Somers AuthorDate: 2025-12-21 15:32:31 +0000 Commit: Alan Somers CommitDate: 2025-12-22 17:18:16 +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 MFC after: 1 week Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D54331 --- 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 b6a32d9b60af..a377ba832ef5 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -980,7 +980,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); }