From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 1214D3851524; Wed, 26 Oct 2022 15:05:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1214D3851524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666796733; bh=3vYUUsXf50jyGXg2SQfoPzRCFD9VR+JShzjtRGuX29g=; h=From:To:Subject:Date:From; b=CvhjFhydxe4Ru0TYSmm7QJWb3jrmDe/SNac8iH8ovfSVmrZj1AmLICPV7ZYasCET3 +cPEMXf/blTmpgCTmkrhkVvdioO0bbp3c67R+qogoFb3EZJhOLlBbFG6S8aIPtjBMA MivedDPS+UUv0NxZRBYL0lvod2osRvx+6PtgH5nQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] Linux: Fix enum fsconfig_command detection in X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: bb1e8b0ca99b5cbedfae3e6245528a87d95ff3e2 X-Git-Newrev: 3bd3c612e98a53ce60ed972f5cd2b90628b3cba5 Message-Id: <20221026150533.1214D3851524@sourceware.org> Date: Wed, 26 Oct 2022 15:05:33 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3bd3c612e98a53ce60ed972f5cd2b90628b3cba5 commit 3bd3c612e98a53ce60ed972f5cd2b90628b3cba5 Author: Florian Weimer Date: Tue Aug 16 09:25:23 2022 +0200 Linux: Fix enum fsconfig_command detection in 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) Diff: --- 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() */