Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ab04d5c authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds
Browse files

vfs: take O_NONBLOCK out of the O_* uniqueness test 



O_NONBLOCK on parisc has a dual value:

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

It is caught by the O_* bits uniqueness check and leads to a parisc
compile error.  The fix would be to take O_NONBLOCK out.

Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
Cc: Jamie Lokier <jamie@shareable.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 33994466

fs/fcntl.c

+7 −3
Original line number Diff line number Diff line
@@ -769,11 +769,15 @@ 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(

	/*

	 * Please add new bits here to ensure allocation uniqueness.

	 * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY

	 * is defined as O_NONBLOCK on some platforms and not on others.

	 */

	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	|

		O_TRUNC		| O_APPEND	| /* O_NONBLOCK	| */

		__O_SYNC	| O_DSYNC	| FASYNC	|

		O_DIRECT	| O_LARGEFILE	| O_DIRECTORY	|

		O_NOFOLLOW	| O_NOATIME	| O_CLOEXEC	|