From nobody Tue Jan 20 22:31:44 2026 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 4dwhrc40Fgz6PFJY for ; Tue, 20 Jan 2026 22:31:44 +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 4dwhrc1r4Jz4CbR for ; Tue, 20 Jan 2026 22:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948304; 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=hvxHyKYusUgC8tPuDBf546jyy24KOuudSk+Kd66JKJ4=; b=RXlOBFlLnzza4+BGe3kAlB+EbpNIU7sYFkDSW0ZM1MkmkTyTYkHUUHJLXi/mlTkeqKGSbb 63J7qHP7V0KTdiJW1bikhA0QCaMVd0YUk0yWR4hOs6/T0t8R9acoz2ryqvazJ4VU9f407P s/jQKeFdFQQdOHHMS898RqshBiVKW6G3YQC9CuWnzg12FkNLMjSlPVfhWp2MMmXhmQI5iM WDjbdEQIR22YF0LXbETByOU/DTaQur06RMdcf+HlbidHrMt1FHN/rlgC44Mwj4TmfbCCWE CSYVEK/DjEuyd2rq3Ohb/3RLRgxqYDgw1P6s2+WpHYzqibpaoNzuWK+PocKHkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948304; 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=hvxHyKYusUgC8tPuDBf546jyy24KOuudSk+Kd66JKJ4=; b=oGQm6nZZUsjmc/3yTt97VIvyxQ9hLteWjEe5P32IyYqbL5ZeiPohX9Su3q9AXvvPxVeI9M J5XCJHObrOGrEnwbqzYE8c0pCDQebfDtbZukTNQGMFb/SQGuUAKxPdVbb87CuC//2JfUMI 0IJDeq2bDzendyPyGtBO2gZntB9BRD5koFg6iDO/gwWszBij8DzKRxS8X4QcQtfWHNuZNR qjfw4rE33J/JCrAum9Z1IVbfRrsz7AzM89i+dcin1MdJtzXP3Eaq2km2SBjXnfKqznMe7u 3HhV80YuHEaATXO+6NRkPsFlCWuvKTBKLm+lI1yih+qt+3eSqxaWMEoA/acBcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768948304; a=rsa-sha256; cv=none; b=CN0NXOvZIN8jhS4MYO/nxkzLZD6/HKo9A2Zmjs6xnRfnHHiHoZYteaf96417HM3FisLJfY RS/qlv0tGwBCWj++suKHeTw0rCqMtdCmHUmal+GHWwxi9qUOg9S885qpf2Ro+mQZNyYCVb B0js4qjXB/9rtzGFIEk6kBgFgINiP5YM/21j6TqwkMywaU+PPZrqp8itIbDZn315/0/OHL f7V9cdIfn+dhdsRZh+uSE9K6ar9Yr3tMrOYYsuaDrwlqi+vgiRu22up5MNXgF8WGFmqPS7 Mf5fBTZBmu5v1EutovsZg8RPoEjfXxLXOm9T+0KyK0M7cVd2uUTfSAGHionq0w== 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 4dwhrc0zsQz5Qs for ; Tue, 20 Jan 2026 22:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 351b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 22:31:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b6533f67c399 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b6533f67c3990dd7db5b37625730db83bf2adc18 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 22:31:44 +0000 Message-Id: <69700250.351b7.1398e01e@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b6533f67c3990dd7db5b37625730db83bf2adc18 commit b6533f67c3990dd7db5b37625730db83bf2adc18 Author: Alan Somers AuthorDate: 2025-12-21 15:32:31 +0000 Commit: Alan Somers CommitDate: 2026-01-20 22:31:30 +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 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); }