sparc64: Handle stack trace attempts before irqstacks are setup.

[linux-2.6] / fs / jfs / super.c

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 50ea65451732edf196c7750c2e1f0ee60b547bba..3630718be395deaada9cfe0c28d11a877fcc31e7 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -22,6 +22,7 @@
 #include <linux/parser.h>
 #include <linux/completion.h>
 #include <linux/vfs.h>
+#include <linux/quotaops.h>
 #include <linux/mount.h>
 #include <linux/moduleparam.h>
 #include <linux/kthread.h>
@@ -499,7 +500,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
        inode = jfs_iget(sb, ROOT_I);
        if (IS_ERR(inode)) {
                ret = PTR_ERR(inode);
-               goto out_no_root;
+               goto out_no_rw;
        }
        sb->s_root = d_alloc_root(inode);
        if (!sb->s_root)
@@ -521,9 +522,8 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
        return 0;
 
 out_no_root:
-       jfs_err("jfs_read_super: get root inode failed");
-       if (inode)
-               iput(inode);
+       jfs_err("jfs_read_super: get root dentry failed");
+       iput(inode);
 
 out_no_rw:
        rc = jfs_umount(sb);
@@ -760,7 +760,7 @@ static struct file_system_type jfs_fs_type = {
        .fs_flags       = FS_REQUIRES_DEV,
 };
 
-static void init_once(struct kmem_cache *cachep, void *foo)
+static void init_once(void *foo)
 {
        struct jfs_inode_info *jfs_ip = (struct jfs_inode_info *) foo;