From fd427c4eaeed4d1099acc7b6188e41c6cfa5bca5 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 1 Apr 2015 19:31:06 -0400 Subject: [PATCH] move O_PATH definition back to arch bits while it's the same for all presently supported archs, it differs at least on sparc, and conceptually it's no less arch-specific than the other O_* macros. O_SEARCH and O_EXEC are still defined in terms of O_PATH in the main fcntl.h. --- arch/arm/bits/fcntl.h | 1 + arch/i386/bits/fcntl.h | 1 + arch/microblaze/bits/fcntl.h | 1 + arch/mips/bits/fcntl.h | 1 + arch/or1k/bits/fcntl.h | 1 + arch/powerpc/bits/fcntl.h | 1 + arch/sh/bits/fcntl.h | 1 + arch/x32/bits/fcntl.h | 1 + arch/x86_64/bits/fcntl.h | 1 + include/fcntl.h | 5 ++--- 10 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/bits/fcntl.h b/arch/arm/bits/fcntl.h index eba10ffc..4cb1753b 100644 --- a/arch/arm/bits/fcntl.h +++ b/arch/arm/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 0200000 #define O_LARGEFILE 0400000 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020040000 #define O_NDELAY O_NONBLOCK diff --git a/arch/i386/bits/fcntl.h b/arch/i386/bits/fcntl.h index 0fa8e19c..ae233cc0 100644 --- a/arch/i386/bits/fcntl.h +++ b/arch/i386/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 040000 #define O_LARGEFILE 0100000 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020200000 #define O_NDELAY O_NONBLOCK diff --git a/arch/microblaze/bits/fcntl.h b/arch/microblaze/bits/fcntl.h index 0fa8e19c..ae233cc0 100644 --- a/arch/microblaze/bits/fcntl.h +++ b/arch/microblaze/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 040000 #define O_LARGEFILE 0100000 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020200000 #define O_NDELAY O_NONBLOCK diff --git a/arch/mips/bits/fcntl.h b/arch/mips/bits/fcntl.h index 5e33f11a..9fd8c23e 100644 --- a/arch/mips/bits/fcntl.h +++ b/arch/mips/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 0100000 #define O_LARGEFILE 020000 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020200000 #define O_NDELAY O_NONBLOCK diff --git a/arch/or1k/bits/fcntl.h b/arch/or1k/bits/fcntl.h index 0fa8e19c..ae233cc0 100644 --- a/arch/or1k/bits/fcntl.h +++ b/arch/or1k/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 040000 #define O_LARGEFILE 0100000 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020200000 #define O_NDELAY O_NONBLOCK diff --git a/arch/powerpc/bits/fcntl.h b/arch/powerpc/bits/fcntl.h index 548e5741..c3f875e5 100644 --- a/arch/powerpc/bits/fcntl.h +++ b/arch/powerpc/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 0400000 #define O_LARGEFILE 0200000 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020040000 #define O_NDELAY O_NONBLOCK diff --git a/arch/sh/bits/fcntl.h b/arch/sh/bits/fcntl.h index 0fa8e19c..ae233cc0 100644 --- a/arch/sh/bits/fcntl.h +++ b/arch/sh/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 040000 #define O_LARGEFILE 0100000 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020200000 #define O_NDELAY O_NONBLOCK diff --git a/arch/x32/bits/fcntl.h b/arch/x32/bits/fcntl.h index 99777139..1b88ad39 100644 --- a/arch/x32/bits/fcntl.h +++ b/arch/x32/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 040000 #define O_LARGEFILE 0 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020200000 #define O_NDELAY O_NONBLOCK diff --git a/arch/x86_64/bits/fcntl.h b/arch/x86_64/bits/fcntl.h index 99777139..1b88ad39 100644 --- a/arch/x86_64/bits/fcntl.h +++ b/arch/x86_64/bits/fcntl.h @@ -15,6 +15,7 @@ #define O_DIRECT 040000 #define O_LARGEFILE 0 #define O_NOATIME 01000000 +#define O_PATH 010000000 #define O_TMPFILE 020200000 #define O_NDELAY O_NONBLOCK diff --git a/include/fcntl.h b/include/fcntl.h index f5bfebc8..ebd5c304 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -37,9 +37,8 @@ int openat(int, const char *, int, ...); int posix_fadvise(int, off_t, off_t, int); int posix_fallocate(int, off_t, off_t); -#define O_SEARCH 010000000 -#define O_EXEC 010000000 -#define O_PATH 010000000 +#define O_SEARCH O_PATH +#define O_EXEC O_PATH #define O_ACCMODE (03|O_SEARCH) #define O_RDONLY 00 -- 2.25.1