Re: [patch 2/5] vfs: O_* bit numbers uniqueness check

[James Bottomley <James.Bottomley@suse.de>]

On Tue, 2010-07-20 at 15:29 -0700, akpm@linux-foundation.org wrote:
> From: Wu Fengguang <fengguang.wu@intel.com>
> 
> The O_* bit numbers are defined in 20+ arch/*, and can silently overlap. 
> Add a compile time check to ensure the uniqueness as suggested by David
> Miller.

Can we get this reverted or fixed?  It's causing the parisc compiles to
fail.  The reason is O_NONBLOCK on parisc has a dual value:

#define O_NONBLOCK	000200004 /* HPUX has separate NDELAY & NONBLOCK */

The fix would be to take O_NONBLOCK out.

James

---

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 6769fd0..aeb02aa 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -770,10 +770,11 @@ EXPORT_SYMBOL(kill_fasync);
 static int __init fcntl_init(void)
 {
 	/* please add new bits here to ensure allocation uniqueness */
-	BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
+	BUILD_BUG_ON(18 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
 		O_RDONLY	| O_WRONLY	| O_RDWR	|
 		O_CREAT		| O_EXCL	| O_NOCTTY	|
-		O_TRUNC		| O_APPEND	| O_NONBLOCK	|
+		/* remove O_NONBLOCK it's a two bit define on parisc */
+		O_TRUNC		| O_APPEND	| /* O_NONBLOCK	| */
 		__O_SYNC	| O_DSYNC	| FASYNC	|
 		O_DIRECT	| O_LARGEFILE	| O_DIRECTORY	|
 		O_NOFOLLOW	| O_NOATIME	| O_CLOEXEC	|