From bae9fdac4620cdbaf33864a14fcd2be7608c2a75 Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Tue, 10 Aug 2010 18:01:29 -0700 Subject: [PATCH] --- yaml --- r: 208419 b: refs/heads/master c: 454eedb8901da895fb602998fa588cd62875d07d h: refs/heads/master i: 208417: e94c7f12d0562b802bcc88f9e7c2eb230e7cf33e 208415: dffa01d5e724bf96909f9600eb85fdcf0cef27b8 v: v3 --- [refs] | 2 +- trunk/fs/fcntl.c | 15 +++++++++++++-- trunk/include/asm-generic/fcntl.h | 4 ++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 47c9b1b4bf0a..f4d29508157c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58939473bacf08e7e7346673c6d70bc367bd091a +refs/heads/master: 454eedb8901da895fb602998fa588cd62875d07d diff --git a/trunk/fs/fcntl.c b/trunk/fs/fcntl.c index 9d175d623aab..6769fd0f35b8 100644 --- a/trunk/fs/fcntl.c +++ b/trunk/fs/fcntl.c @@ -767,11 +767,22 @@ void kill_fasync(struct fasync_struct **fp, int sig, int band) } EXPORT_SYMBOL(kill_fasync); -static int __init fasync_init(void) +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( + 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 + )); + fasync_cache = kmem_cache_create("fasync_cache", sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL); return 0; } -module_init(fasync_init) +module_init(fcntl_init) diff --git a/trunk/include/asm-generic/fcntl.h b/trunk/include/asm-generic/fcntl.h index e3cbc38bdcc2..a70b2d2bfc14 100644 --- a/trunk/include/asm-generic/fcntl.h +++ b/trunk/include/asm-generic/fcntl.h @@ -11,6 +11,10 @@ * -Eric Paris */ +/* + * When introducing new O_* bits, please check its uniqueness in fcntl_init(). + */ + #define O_ACCMODE 00000003 #define O_RDONLY 00000000 #define O_WRONLY 00000001