[XFS] Fix uninitialized br_state and br_startoff in

[pandora-kernel.git] / fs / gfs2 / main.c

diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index c8d17b7..9889c1e 100644 (file)
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/sched.h>
@@ -15,14 +15,46 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
+#include <linux/lm_interface.h>
+#include <asm/atomic.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "ops_fstype.h"
 #include "sys.h"
 #include "util.h"
+#include "glock.h"
+
+static void gfs2_init_inode_once(void *foo, kmem_cache_t *cachep, unsigned long flags)
+{
+       struct gfs2_inode *ip = foo;
+       if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
+           SLAB_CTOR_CONSTRUCTOR) {
+               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));
+       }
+}
+
+static void gfs2_init_glock_once(void *foo, kmem_cache_t *cachep, unsigned long flags)
+{
+       struct gfs2_glock *gl = foo;
+       if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
+           SLAB_CTOR_CONSTRUCTOR) {
+               INIT_HLIST_NODE(&gl->gl_list);
+               spin_lock_init(&gl->gl_spin);
+               INIT_LIST_HEAD(&gl->gl_holders);
+               INIT_LIST_HEAD(&gl->gl_waiters1);
+               INIT_LIST_HEAD(&gl->gl_waiters2);
+               INIT_LIST_HEAD(&gl->gl_waiters3);
+               gl->gl_lvb = NULL;
+               atomic_set(&gl->gl_lvb_count, 0);
+               INIT_LIST_HEAD(&gl->gl_reclaim);
+               INIT_LIST_HEAD(&gl->gl_ail_list);
+               atomic_set(&gl->gl_ail_count, 0);
+       }
+}
 
 /**
  * init_gfs2_fs - Register GFS2 as a filesystem
@@ -34,23 +66,27 @@ static int __init init_gfs2_fs(void)
 {
        int error;
 
-       gfs2_init_lmh();
-
        error = gfs2_sys_init();
        if (error)
                return error;
 
-       error = -ENOMEM;
+       error = gfs2_glock_init();
+       if (error)
+               goto fail;
 
+       error = -ENOMEM;
        gfs2_glock_cachep = kmem_cache_create("gfs2_glock",
                                              sizeof(struct gfs2_glock),
-                                             0, 0, NULL, NULL);
+                                             0, 0,
+                                             gfs2_init_glock_once, NULL);
        if (!gfs2_glock_cachep)
                goto fail;
 
        gfs2_inode_cachep = kmem_cache_create("gfs2_inode",
                                              sizeof(struct gfs2_inode),
-                                             0, 0, NULL, NULL);
+                                             0,  SLAB_RECLAIM_ACCOUNT|
+                                                 SLAB_MEM_SPREAD,
+                                             gfs2_init_inode_once, NULL);
        if (!gfs2_inode_cachep)
                goto fail;