From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-xe2f.google.com (mail-vs1-xe2f.google.com [IPv6:2607:f8b0:4864:20::e2f]) by sourceware.org (Postfix) with ESMTPS id 783453853819 for ; Wed, 24 Aug 2022 13:07:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 783453853819 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-vs1-xe2f.google.com with SMTP id m66so17423717vsm.12 for ; Wed, 24 Aug 2022 06:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=OLCwiNSMNuJFMizT79ZAlMD5uHgY2S3GNM29bVz90Io=; b=EDX3sR7kQlenh94jKKd6gn5nvM8H3iyjq29wMIQoMFnBksxJf+O06lO3LrXaXUp/7s pMrtvFNa+T2gThT19GcjGea7mbE7q8DqUW3UpNwhwjIm5AUMxa4iG7l5/jw+xCMk9PY4 FkQCPwRShYzoeM5xoPUgUDDl4GKrsloK5lV+OktBkCrRfEz0LpHl9tSQ4PXCZ7ClZD0l mnAPxUtxRxoD/UpsRrO3rBhfxuMXQWKZcWrk3ZPQ8SuvbtkJ+ZB0oXUX9b4c7OK3bpap FpSXT3TZdv+jnLjEV6lGaiUE088QKaOsQwFrVKdLVtCWWXFWniI6EEMfQayjvGorNekD XQ/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=OLCwiNSMNuJFMizT79ZAlMD5uHgY2S3GNM29bVz90Io=; b=H/ahjkkTA4wzjaHnZe7wIDRob6KZnyOLzUz+QkQ7eiK78+kFU6KfR7cZxM1SKnkq5I BDCG7lOny3FXa5poVnVXk72oN0C1bvVblWNsNmDNiujEsgf0I1tQEI4PBSQ7zrGkTXuw olOg6WOtwhOoBNDSvEVpoSOGyoWZgMxfyR88fFYyLNStgxBMZXF0vmXCqziEjGHRtSIO HndVXIro9K8RZmbKGiZuwJJPXRUVbOmSKoJZM6zMDJ7zHYO5xTEH0KrsbjQwYEJ5Muwf 5EvZVhvwnlL4D5tzciRgwEjzm4UM6gwta+Rxj26IOWT571ZTv/Vm1kKweo6+C2u+QKnN O6iA== X-Gm-Message-State: ACgBeo1/pfQ6WdjCqEN5Wl5iKL8oMnbLRgGVCepCQbQjBajrTjQB17RZ Umc4zGifKfguipdO9+FfsCGHusJLNSMUDQ== X-Google-Smtp-Source: AA6agR4KEUz5l9Uns4SSuGUT+/xJandwzkurq6Ml7O0w/l27fKX1cOm4ourmPzXMuSLV0joBXzMjyg== X-Received: by 2002:a67:d317:0:b0:390:462c:2dd1 with SMTP id a23-20020a67d317000000b00390462c2dd1mr6767016vsj.17.1661346456584; Wed, 24 Aug 2022 06:07:36 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:745e:1e2b:867:85d9:4667]) by smtp.gmail.com with ESMTPSA id k6-20020a9f3f86000000b0038275916987sm13709836uaj.14.2022.08.24.06.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 06:07:36 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Florian Weimer Subject: [COMMITTED 2.36 5/5] Linux: Fix enum fsconfig_command detection in Date: Wed, 24 Aug 2022 10:07:20 -0300 Message-Id: <20220824130720.2236114-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220824130720.2236114-1-adhemerval.zanella@linaro.org> References: <20220824130720.2236114-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Florian Weimer The #ifdef FSOPEN_CLOEXEC check did not work because the macro was always defined in this header prior to the check, so that the contents did not matter. Fixes commit 774058d72942249f71d74e7f2b639f77184160a6 ("linux: Fix sys/mount.h usage with kernel headers"). (cherry picked from commit 2955ef4b7c9b56fcd7abfeddef7ee83c60abff98) --- sysdeps/unix/sysv/linux/sys/mount.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h index 2e3fd6a7fe..19841d0738 100644 --- a/sysdeps/unix/sysv/linux/sys/mount.h +++ b/sysdeps/unix/sysv/linux/sys/mount.h @@ -188,9 +188,6 @@ enum }; -/* fsopen flags. */ -#define FSOPEN_CLOEXEC 0x00000001 - /* fsmount flags. */ #define FSMOUNT_CLOEXEC 0x00000001 @@ -261,6 +258,9 @@ enum fsconfig_command }; #endif +/* fsopen flags. */ +#define FSOPEN_CLOEXEC 0x00000001 + /* open_tree flags. */ #define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */ #define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */ -- 2.34.1