diff options
author | Wu Fengguang <fengguang.wu@intel.com> | 2010-08-10 21:01:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 11:59:02 -0400 |
commit | 454eedb8901da895fb602998fa588cd62875d07d (patch) | |
tree | 8ac0f8fead7c689dec077fb43efe3dbe3eab2e29 | |
parent | 58939473bacf08e7e7346673c6d70bc367bd091a (diff) |
vfs: O_* bit numbers uniqueness check
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.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: David Miller <davem@davemloft.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Eric Paris <eparis@redhat.com>
Cc: Roland Dreier <rdreier@cisco.com>
Cc: Jamie Lokier <jamie@shareable.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/fcntl.c | 15 | ||||
-rw-r--r-- | include/asm-generic/fcntl.h | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 9d175d623aab..6769fd0f35b8 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -767,11 +767,22 @@ void kill_fasync(struct fasync_struct **fp, int sig, int band) | |||
767 | } | 767 | } |
768 | EXPORT_SYMBOL(kill_fasync); | 768 | EXPORT_SYMBOL(kill_fasync); |
769 | 769 | ||
770 | static int __init fasync_init(void) | 770 | static int __init fcntl_init(void) |
771 | { | 771 | { |
772 | /* please add new bits here to ensure allocation uniqueness */ | ||
773 | BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32( | ||
774 | O_RDONLY | O_WRONLY | O_RDWR | | ||
775 | O_CREAT | O_EXCL | O_NOCTTY | | ||
776 | O_TRUNC | O_APPEND | O_NONBLOCK | | ||
777 | __O_SYNC | O_DSYNC | FASYNC | | ||
778 | O_DIRECT | O_LARGEFILE | O_DIRECTORY | | ||
779 | O_NOFOLLOW | O_NOATIME | O_CLOEXEC | | ||
780 | FMODE_EXEC | ||
781 | )); | ||
782 | |||
772 | fasync_cache = kmem_cache_create("fasync_cache", | 783 | fasync_cache = kmem_cache_create("fasync_cache", |
773 | sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL); | 784 | sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL); |
774 | return 0; | 785 | return 0; |
775 | } | 786 | } |
776 | 787 | ||
777 | module_init(fasync_init) | 788 | module_init(fcntl_init) |
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index e3cbc38bdcc2..a70b2d2bfc14 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h | |||
@@ -11,6 +11,10 @@ | |||
11 | * -Eric Paris | 11 | * -Eric Paris |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* | ||
15 | * When introducing new O_* bits, please check its uniqueness in fcntl_init(). | ||
16 | */ | ||
17 | |||
14 | #define O_ACCMODE 00000003 | 18 | #define O_ACCMODE 00000003 |
15 | #define O_RDONLY 00000000 | 19 | #define O_RDONLY 00000000 |
16 | #define O_WRONLY 00000001 | 20 | #define O_WRONLY 00000001 |