From 6a13f0542963322178a8e7d6ab0607554c66d6bb Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Wed, 28 Jul 2010 10:18:37 -0400 Subject: [PATCH] --- yaml --- r: 207711 b: refs/heads/master c: 20dee624ca40db227aa70cb3f44d2d6cb4fdbab4 h: refs/heads/master i: 207709: e576f7064f2ef18c3c326e19431aac78a8ea2269 207707: a43c497f36f32147470d2321fc3ea3c18523618e 207703: 76a58dac4c1c4b356199fd7c3f7aafceae7387ef 207695: 5fa894c0109578f39b62cd8f2ed5704439db2acd 207679: 652f8c23fe2a2ec3a1823f0e2e8caadb80d74725 v: v3 --- [refs] | 2 +- trunk/fs/notify/fsnotify.c | 2 ++ trunk/include/linux/fsnotify_backend.h | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8a087e4ecd04..eee5226eceef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44b350fc23e36e95c8e042b7ded66217ea2b9d72 +refs/heads/master: 20dee624ca40db227aa70cb3f44d2d6cb4fdbab4 diff --git a/trunk/fs/notify/fsnotify.c b/trunk/fs/notify/fsnotify.c index 9810babb1a3b..076c10e959d5 100644 --- a/trunk/fs/notify/fsnotify.c +++ b/trunk/fs/notify/fsnotify.c @@ -275,6 +275,8 @@ EXPORT_SYMBOL_GPL(fsnotify); static __init int fsnotify_init(void) { + BUG_ON(hweight32(ALL_FSNOTIFY_EVENTS) != 23); + return init_srcu_struct(&fsnotify_grp_srcu); } subsys_initcall(fsnotify_init); diff --git a/trunk/include/linux/fsnotify_backend.h b/trunk/include/linux/fsnotify_backend.h index 4b809fcd4996..a46355db1e47 100644 --- a/trunk/include/linux/fsnotify_backend.h +++ b/trunk/include/linux/fsnotify_backend.h @@ -64,6 +64,15 @@ #define FS_MOVE (FS_MOVED_FROM | FS_MOVED_TO) +#define ALL_FSNOTIFY_EVENTS (FS_ACCESS | FS_MODIFY | FS_ATTRIB | \ + FS_CLOSE_WRITE | FS_CLOSE_NOWRITE | FS_OPEN | \ + FS_MOVED_FROM | FS_MOVED_TO | FS_CREATE | \ + FS_DELETE | FS_DELETE_SELF | FS_MOVE_SELF | \ + FS_UNMOUNT | FS_Q_OVERFLOW | FS_IN_IGNORED | \ + FS_OPEN_PERM | FS_ACCESS_PERM | FS_EXCL_UNLINK | \ + FS_IN_ISDIR | FS_IN_ONESHOT | FS_DN_RENAME | \ + FS_DN_MULTISHOT | FS_EVENT_ON_CHILD) + struct fsnotify_group; struct fsnotify_event; struct fsnotify_mark;