Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' and 'toshi...

[linux-2.6-omap-h63xx.git] / fs / gfs2 / main.c

diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index 7ecfe0d3a4913e7d5dc2396599526cb2f781527f..9c7765c12d62eeac6443d853cf6bde4584019690 100644 (file)
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -29,9 +29,8 @@ 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(struct kmem_cache *cachep, void *foo)