From nobody Wed Jul 2 10:23:04 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 4bXGF53B4Jz60DHj; Wed, 02 Jul 2025 10:23:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXGF507QQz3Kfn; Wed, 02 Jul 2025 10:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751451785; 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=awgxKdp1OqMMSVKF5mfsOCQ/9T4wAuUGR15C2vWt4L8=; b=a0EaN8Jvc6aIJhmHnQ/H95q6r8q/OLuTgbpoF0tmqjjxfb2PCAtDyzbQspZhJrk7xh8k5z l/NdAwoa14y8iJoqzRj3ZSo31vnDG2Uu0X06vpGaGbT7aRC/CqhISRWl4+66VcU6wqbamp DxV4fG21H3+jc4VWH5l2m3MyO6MRVGnafuhkvR8468kAHJdX0AX6w5KVD91UOJQWbF4OP8 lwL/FSHLLXu0hyXn74OhTIxx/ZoBvZAjD7BS3ff8YmoQCqJoWP2/OjJLPxE2cvswlt+voN u9XPtB9zpYwyPpzUlZk74bSurZ2njKA9j661mstomx1cCEIy6OoXKuBHaU9m5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751451785; 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=awgxKdp1OqMMSVKF5mfsOCQ/9T4wAuUGR15C2vWt4L8=; b=csmjED2BKfoZiYT0UrfA0gUGwZD0C8V69pNAmvFVyg5K4PT99kJBDXjeIyhhQk3qNA8JbS qQ7tHP0aVUX5bTO8OaFGVJtqpnr0uo/Me1gLpK+QqWVNDx/oSALJCFpxBumhTQwhuVE/qF 6kbxiM5UKsyrrYzChADTirtCzrXzJqv4gMyEYpWhIWeKBEGNCAUtaTiu2huw7Xc6ZW+isG biYCqT41T2ufnFXLbGU7s3X/MUGTKxYn0Gn1HXpGiJNs3vS2I1CviYBzg1zgHp7SFfpo0o i2FevBV4GjeNjgRxB9iqZ9b76z+qmdOPYi3ZseBQRdxTwilLhC06KQl4kDiBKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751451785; a=rsa-sha256; cv=none; b=nhzTO33AdMs2KMZkvPLb7g4PvMQ9dGD8T7H6DflHVp0FzsOG/S8yP2ss7PDFLZ/P3054Yc Shsdi5dQATEZny9uDXfyuDfXuLjWzOY1NQPXcdW3ZItXTsPXc3nYTozgX/E1uYDqOdWIHe JrY6jH2HwzBuCTp50f9DMi0yass8aNPmTQrhlqlgPIETtJ2ixZG9PPKLD0uxiqyyb4X6BM VX3ju5otodcHk/YgISaWIER2/Zm1kJNrsti3RGGXuJ9u+Q/1EZ09+FI/YejGhND8FLfd27 kpVoREBjQDL3NMgzUIqToyI4JDKtibPYr7yo8GrzhZWLdVeatT+hPRuwjxYYTg== 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 4bXGF460Myz1HG; Wed, 02 Jul 2025 10:23:04 +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 562AN4w0050204; Wed, 2 Jul 2025 10:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562AN403050201; Wed, 2 Jul 2025 10:23:04 GMT (envelope-from git) Date: Wed, 2 Jul 2025 10:23:04 GMT Message-Id: <202507021023.562AN403050201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 5e96f4006d2e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5e96f4006d2e5f165531a53b6c1393a1c7604f42 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5e96f4006d2e5f165531a53b6c1393a1c7604f42 commit 5e96f4006d2e5f165531a53b6c1393a1c7604f42 Author: Dag-Erling Smørgrav AuthorDate: 2025-07-02 10:22:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-02 10:22:29 +0000 opendir: Simplify is_unionstack(). Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51118 --- 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); } /*