Merge branches 'release' and 'gpe-ack' into release

[linux.git] / fs / gfs2 / main.c

diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index 79c91fd8381bc11d61bba006daba21a1cf713f81..9c7765c12d62eeac6443d853cf6bde4584019690 100644 (file)
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -24,17 +24,16 @@
 #include "util.h"
 #include "glock.h"
 
-static void gfs2_init_inode_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
+static void gfs2_init_inode_once(struct kmem_cache *cachep, void *foo)
 {
        struct gfs2_inode *ip = foo;
 
        inode_init_once(&ip->i_inode);
-       spin_lock_init(&ip->i_spin);
        init_rwsem(&ip->i_rw_mutex);
-       memset(ip->i_cache, 0, sizeof(ip->i_cache));
+       ip->i_alloc = NULL;
 }
 
-static void gfs2_init_glock_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
+static void gfs2_init_glock_once(struct kmem_cache *cachep, void *foo)
 {
        struct gfs2_glock *gl = foo;