diff options
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/main.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index e460487c0557..787a0edef100 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c | |||
| @@ -27,29 +27,27 @@ | |||
| 27 | static void gfs2_init_inode_once(void *foo, struct kmem_cache *cachep, unsigned long flags) | 27 | static void gfs2_init_inode_once(void *foo, struct kmem_cache *cachep, unsigned long flags) |
| 28 | { | 28 | { |
| 29 | struct gfs2_inode *ip = foo; | 29 | struct gfs2_inode *ip = foo; |
| 30 | if (flags & SLAB_CTOR_CONSTRUCTOR) { | 30 | |
| 31 | inode_init_once(&ip->i_inode); | 31 | inode_init_once(&ip->i_inode); |
| 32 | spin_lock_init(&ip->i_spin); | 32 | spin_lock_init(&ip->i_spin); |
| 33 | init_rwsem(&ip->i_rw_mutex); | 33 | init_rwsem(&ip->i_rw_mutex); |
| 34 | memset(ip->i_cache, 0, sizeof(ip->i_cache)); | 34 | memset(ip->i_cache, 0, sizeof(ip->i_cache)); |
| 35 | } | ||
| 36 | } | 35 | } |
| 37 | 36 | ||
| 38 | static void gfs2_init_glock_once(void *foo, struct kmem_cache *cachep, unsigned long flags) | 37 | static void gfs2_init_glock_once(void *foo, struct kmem_cache *cachep, unsigned long flags) |
| 39 | { | 38 | { |
| 40 | struct gfs2_glock *gl = foo; | 39 | struct gfs2_glock *gl = foo; |
| 41 | if (flags & SLAB_CTOR_CONSTRUCTOR) { | 40 | |
| 42 | INIT_HLIST_NODE(&gl->gl_list); | 41 | INIT_HLIST_NODE(&gl->gl_list); |
| 43 | spin_lock_init(&gl->gl_spin); | 42 | spin_lock_init(&gl->gl_spin); |
| 44 | INIT_LIST_HEAD(&gl->gl_holders); | 43 | INIT_LIST_HEAD(&gl->gl_holders); |
| 45 | INIT_LIST_HEAD(&gl->gl_waiters1); | 44 | INIT_LIST_HEAD(&gl->gl_waiters1); |
| 46 | INIT_LIST_HEAD(&gl->gl_waiters3); | 45 | INIT_LIST_HEAD(&gl->gl_waiters3); |
| 47 | gl->gl_lvb = NULL; | 46 | gl->gl_lvb = NULL; |
| 48 | atomic_set(&gl->gl_lvb_count, 0); | 47 | atomic_set(&gl->gl_lvb_count, 0); |
| 49 | INIT_LIST_HEAD(&gl->gl_reclaim); | 48 | INIT_LIST_HEAD(&gl->gl_reclaim); |
| 50 | INIT_LIST_HEAD(&gl->gl_ail_list); | 49 | INIT_LIST_HEAD(&gl->gl_ail_list); |
| 51 | atomic_set(&gl->gl_ail_count, 0); | 50 | atomic_set(&gl->gl_ail_count, 0); |
| 52 | } | ||
| 53 | } | 51 | } |
| 54 | 52 | ||
| 55 | /** | 53 | /** |