From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by sourceware.org (Postfix) with ESMTPS id 43E8D3858C33 for ; Thu, 25 Aug 2022 06:50:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 43E8D3858C33 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=fedoraproject.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f45.google.com with SMTP id d21so18332096eje.3 for ; Wed, 24 Aug 2022 23:50:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=hz/7f0D1jDBHzYkgI6aVon3G68Psn0+RVVG4D+9B2P8=; b=d95DEvnrxifMOO2xhFni16NHSNyjuKwoROkzRBFuhD6OPlyRYO4CT0gVd6Q68UEhHc WkfiSWYCm5Les76J1eFF8OYcLZMGfEjfuZ3hAdvjn58nUK4oQSYXTpbsax7Jbv67e02A 6sbstvhFVr9JkVMf/7+ib8vCiu5WPMX992mBZC8CguBE5aQ971co9pzDzzLE0+/wRlj3 XWF0yiQ4FmvipWqdoCx0+yJWZ8VNEr1PwudDWhC4d04E1lWyIeWaVElLlH0KyYaTaANT 5+FN/VFIFz9wSsKDPaJeh+uU/qg717oAfGyVQAz+Hw9M1+7devcN98Y677dv1vM/EWO+ Y0Yg== X-Gm-Message-State: ACgBeo3MLE8qiPC7vVU2trKpkuPTuFr2qLC/Tk1kpSdrSRezOjeGxB3v zEZTLObQBpdQxLFweUZ6Az/l5HyCNpTBBg== X-Google-Smtp-Source: AA6agR7DM61LFFJp1i7acPOO7fpW77/FEMu7T4YG1eMmU9WC4O4f+BHGlkPLjdKB+IHTH/C4rtC+iA== X-Received: by 2002:a17:907:6818:b0:730:9b90:84b7 with SMTP id qz24-20020a170907681800b007309b9084b7mr1491949ejc.643.1661410202170; Wed, 24 Aug 2022 23:50:02 -0700 (PDT) Received: from ZmUwYTR.. ([217.149.135.167]) by smtp.gmail.com with ESMTPSA id f23-20020a50fc97000000b004465d1db765sm78332edq.89.2022.08.24.23.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 23:50:01 -0700 (PDT) From: Radostin Stoyanov To: libc-alpha@sourceware.org Cc: Radostin Stoyanov Subject: [PATCH] linux: Fix sys/mount.h usage of FSOPEN_CLOEXEC Date: Thu, 25 Aug 2022 08:49:59 +0200 Message-Id: <20220825064959.42153-1-rstoyanov@fedoraproject.org> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: In commit 774058d72942249f71d74e7f2b639f77184160a6 was introduced ifndef FSOPEN_CLOEXEC condition surrounding fsconfig_command. However, the compilation would fail when there are multiple `define FSOPEN_CLOEXEC`. This patch moves the #endif for `#ifndef FSOPEN_CLOEXEC` after `#define FSOPEN_CLOEXEC`. Signed-off-by: Radostin Stoyanov --- sysdeps/unix/sysv/linux/sys/mount.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h index 19841d0738..92476ba2e7 100644 --- a/sysdeps/unix/sysv/linux/sys/mount.h +++ b/sysdeps/unix/sysv/linux/sys/mount.h @@ -256,11 +256,12 @@ enum fsconfig_command FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */ # define FSCONFIG_CMD_RECONFIGURE FSCONFIG_CMD_RECONFIGURE }; -#endif /* fsopen flags. */ #define FSOPEN_CLOEXEC 0x00000001 +#endif + /* 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.37.2