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.

diff --git a/arch/arm/bits/fcntl.h b/arch/arm/bits/fcntl.h
index eba10ffcae24997e91ec9705f0c70a3f31e7ac28..4cb1753b76733e7b74b080d39e016f5af6fdc865 100644 (file)
--- 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 0fa8e19ced68b9ac25c6f1d3bd24e4e78440eabd..ae233cc003c2c62ccdc2e39e5f6e7678976022a3 100644 (file)
--- 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 0fa8e19ced68b9ac25c6f1d3bd24e4e78440eabd..ae233cc003c2c62ccdc2e39e5f6e7678976022a3 100644 (file)
--- 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 5e33f11af7209c376e63eed4766651ce8bba6db0..9fd8c23e2745740118a5d0434626b55db53b67fe 100644 (file)
--- 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 0fa8e19ced68b9ac25c6f1d3bd24e4e78440eabd..ae233cc003c2c62ccdc2e39e5f6e7678976022a3 100644 (file)
--- 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 548e57419c5d3509a2600d08e13521ea941d4818..c3f875e5bc4ccb730ab081108aeb6402798ac435 100644 (file)
--- 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 0fa8e19ced68b9ac25c6f1d3bd24e4e78440eabd..ae233cc003c2c62ccdc2e39e5f6e7678976022a3 100644 (file)
--- 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 997771392c94789698e0ae59d23c30faa5a37887..1b88ad3917edefade45771b39e4d668e0e2ec23e 100644 (file)
--- 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 997771392c94789698e0ae59d23c30faa5a37887..1b88ad3917edefade45771b39e4d668e0e2ec23e 100644 (file)
--- 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 f5bfebc8e57d31d3f11ef3f39c54887b9fd90a3b..ebd5c30491c1cc6f6bfc146c48c6b8b946fdde51 100644 (file)
--- 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