From eb091499bf14a56df4e9c032bc5dac4c12ffa43a Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Tue, 9 Oct 2012 14:49:54 -0700 Subject: [PATCH] --- yaml --- r: 333706 b: refs/heads/master c: 4b2c551f77f5a0c496e2125b1d883f4b26aabf2c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/file_table.c | 2 +- trunk/include/linux/lglock.h | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d73e2d557612..5f3a6ff9a3da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 466cab878ef98a0618734a1fa64a02e5fbf90867 +refs/heads/master: 4b2c551f77f5a0c496e2125b1d883f4b26aabf2c diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c index dac67923330f..a72bf9ddd0d2 100644 --- a/trunk/fs/file_table.c +++ b/trunk/fs/file_table.c @@ -36,7 +36,7 @@ struct files_stat_struct files_stat = { .max_files = NR_FILE }; -DEFINE_LGLOCK(files_lglock); +DEFINE_STATIC_LGLOCK(files_lglock); /* SLAB cache for file structures */ static struct kmem_cache *filp_cachep __read_mostly; diff --git a/trunk/include/linux/lglock.h b/trunk/include/linux/lglock.h index 8f974517c48a..0d24e932db0b 100644 --- a/trunk/include/linux/lglock.h +++ b/trunk/include/linux/lglock.h @@ -32,7 +32,8 @@ #define br_write_lock(name) lg_global_lock(name) #define br_write_unlock(name) lg_global_unlock(name) -#define DEFINE_BRLOCK(name) DEFINE_LGLOCK(name) +#define DEFINE_BRLOCK(name) DEFINE_LGLOCK(name) +#define DEFINE_STATIC_BRLOCK(name) DEFINE_STATIC_LGLOCK(name) #ifdef CONFIG_DEBUG_LOCK_ALLOC #define LOCKDEP_INIT_MAP lockdep_init_map @@ -53,6 +54,11 @@ struct lglock { = __ARCH_SPIN_LOCK_UNLOCKED; \ struct lglock name = { .lock = &name ## _lock } +#define DEFINE_STATIC_LGLOCK(name) \ + static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock) \ + = __ARCH_SPIN_LOCK_UNLOCKED; \ + static struct lglock name = { .lock = &name ## _lock } + void lg_lock_init(struct lglock *lg, char *name); void lg_local_lock(struct lglock *lg); void lg_local_unlock(struct lglock *lg);