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

Commit ccb973e6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

fs: add a VALID_OPEN_FLAGS 



commit 80f18379a7c350c011d30332658aa15fe49a8fa5 upstream.

Add a central define for all valid open flags, and use it in the uniqueness
check.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4282d395

fs/fcntl.c

+4 −10
Original line number Diff line number Diff line
@@ -740,16 +740,10 @@ static int __init fcntl_init(void) 
	 * 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(21 - 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_SYNC	| O_DSYNC	| FASYNC	|

		O_DIRECT	| O_LARGEFILE	| O_DIRECTORY	|

		O_NOFOLLOW	| O_NOATIME	| O_CLOEXEC	|

		__FMODE_EXEC	| O_PATH	| __O_TMPFILE	|

		__FMODE_NONOTIFY

		));

	BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ !=

		HWEIGHT32(

			(VALID_OPEN_FLAGS & ~(O_NONBLOCK | O_NDELAY)) |

			__FMODE_EXEC | __FMODE_NONOTIFY));



	fasync_cache = kmem_cache_create("fasync_cache",

		sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL);

include/linux/fcntl.h

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,12 @@ 


#include <uapi/linux/fcntl.h>



/* list of all valid flags for the open/openat flags argument: */

#define VALID_OPEN_FLAGS \

	(O_RDONLY | O_WRONLY | O_RDWR | O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC | \

	 O_APPEND | O_NDELAY | O_NONBLOCK | O_NDELAY | __O_SYNC | O_DSYNC | \

	 FASYNC	| O_DIRECT | O_LARGEFILE | O_DIRECTORY | O_NOFOLLOW | \

	 O_NOATIME | O_CLOEXEC | O_PATH | __O_TMPFILE)



#ifndef force_o_largefile

#define force_o_largefile() (BITS_PER_LONG != 32)