From nobody Thu Feb 5 15:27:29 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 4f6Lgj6G3yz6QkVZ for ; Thu, 05 Feb 2026 15:27:29 +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 4f6Lgj4fKtz3Xh8 for ; Thu, 05 Feb 2026 15:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305249; 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=C7HUubp45J6rgX7Xiqne/L5iehgwqRiBpdMUJ9pMpEw=; b=R82o+UcuPcqHVnwxrqpmPU9NPmzFOHhfi8Tw6VspwjEHJjrmYc4AHvN39Ycw0bCokGYP5n deqfGfkUXzjKtq8dNFvkBxmiKFR9DTJmnPegOiHLwuW1eM9vwhjmtIHKMW4coG/dHE185a ZQgI9hqIrSj1WmmUhti+Hzmv8kWmTZfDLgx8v9dqA1L+pt/l15eboa8QhF6c9rISXDdvnS wlmtCSVNufAGuxK6k/gRAYFIWfN8Beck1+huaqxcEczIXP1QFW7TPkdYDRJ20mgRq/XQnA Wu8+WStFyGAA+Rxm226J/nF6af4z+z8xxiYF2BSMxoOh+gp9eJ+A75JjMcQ8jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305249; a=rsa-sha256; cv=none; b=PPBQ0l26makAThVfENAsd2KcJtvLkn+H2EUyfjNCHPpEAY+k/IEik7VF0dmA8vltdYfZ5W GbkSjBJ8iQfDbNsOIR9LzJGUSnJs5fKc/uDyhV/dwSqXrh9O3J4zAr1Dwiu89CsMR9yqFv drcE49PeduBiRRamJ8BWBDVacORQO/vFocjUL7bDTKMs75Uqwt7rfYOP9A7JdoIm/Xt2oJ KooemsYJY840uh4//du0a85GUpDchqm/4MFshQhsYa4D8KfxS/H80Vfc1AkHsonWeFKRX0 zTn3YlstBuvUM8bBgS6E6Ra5T6/LIebYTApckwMw/D9zEWK5QwYJy7gRkOeeeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305249; 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=C7HUubp45J6rgX7Xiqne/L5iehgwqRiBpdMUJ9pMpEw=; b=b7eKRFmqwx3E+2M6wbiEAc7Zk1ftlCnM6AmtfiQAZO+/m0UFopAmvF2SuLgX3+++7U91S9 512YzvhobUmfNL0+HnN93vHpf85q9ZCqZ+YeMULUhkhbnvjaCgD5mbFHcN3HREIATAPpyu n5XbzFeJOZ0ae46WWxPC/aYvfGlEEdofzYZad121Md5+/cykH9clBYNvNtMAdrURuP0hM1 B7dpfmde7VRsHIz4/W9DdSrrvSi256PghgI7C2M48OYrHbLumV/ThMV/tg2IcOWABBNPsd fAXOStm8ZwWndrqLzdO4SgywZL802VuXqnhwM9sHSzh2thn9aIksiOnC3Yu/DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lgj3hxqzbH0 for ; Thu, 05 Feb 2026 15:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:27:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b10a31f4e0f4 - stable/14 - opendir: Simplify is_unionstack(). 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b10a31f4e0f43857f63390a451857fb3c733e26f Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:27:29 +0000 Message-Id: <6984b6e1.3fb9e.2350bef5@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b10a31f4e0f43857f63390a451857fb3c733e26f commit b10a31f4e0f43857f63390a451857fb3c733e26f Author: Dag-Erling Smørgrav AuthorDate: 2025-07-02 10:22:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:47:47 +0000 opendir: Simplify is_unionstack(). Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51118 (cherry picked from commit 5e96f4006d2e5f165531a53b6c1393a1c7604f42) --- lib/libc/gen/opendir2.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/libc/gen/opendir2.c b/lib/libc/gen/opendir2.c index 30a9030693e4..b9ac23e6d9fd 100644 --- a/lib/libc/gen/opendir2.c +++ b/lib/libc/gen/opendir2.c @@ -243,20 +243,18 @@ _filldir(DIR *dirp, bool use_current_pos) return (true); } +/* + * Return true if the file descriptor is associated with a file from a + * union file system or from a file system mounted with the union flag. + */ static bool is_unionstack(int fd) { - int unionstack; - - unionstack = _fcntl(fd, F_ISUNIONSTACK, 0); - if (unionstack != -1) - return (unionstack); - /* - * Should not happen unless running on a kernel without the op, - * but no use rendering the system useless in such a case. + * This call shouldn't fail, but if it does, just assume that the + * answer is no. */ - return (0); + return (_fcntl(fd, F_ISUNIONSTACK, 0) > 0); } /*