DEFINE_STATIC_SRCU() defines srcu struct and do init at build time.
Signed-off-by: Lai Jiangshan <la...@cn.fujitsu.com>
Cc: Eric Paris <epa...@parisplace.org>
---
fs/notify/fsnotify.c | 6 ------
fs/notify/mark.c | 2 +-
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index 4bb21d6..aba962a 100644
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -298,14 +298,8 @@ EXPORT_SYMBOL_GPL(fsnotify);
static __init int fsnotify_init(void)
{
- int ret;
-
BUG_ON(hweight32(ALL_FSNOTIFY_EVENTS) != 23);
- ret = init_srcu_struct(&fsnotify_mark_srcu);
- if (ret)
- panic("initializing fsnotify_mark_srcu");
-
return 0;
}
core_initcall(fsnotify_init);
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index fc6b49b..aeededc 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -97,7 +97,7 @@
#include <linux/fsnotify_backend.h>
#include "fsnotify.h"
-struct srcu_struct fsnotify_mark_srcu;
+DEFINE_SRCU(fsnotify_mark_srcu);
static DEFINE_SPINLOCK(destroy_lock);
static LIST_HEAD(destroy_list);
static DECLARE_WAIT_QUEUE_HEAD(destroy_waitq);
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
