Merge branch 'fix-dss-mux' into fixes

[~andy/linux] / fs / coda / inode.c

diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 5e2e1b3f068d432ab082c43f97b0cb00d3d86000..2870597b5c9d37e416c03d2e894c2556713b3339 100644 (file)
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -21,7 +21,6 @@
 #include <linux/vfs.h>
 #include <linux/slab.h>
 
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 #include <linux/fs.h>
@@ -208,13 +207,12 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
         if (IS_ERR(root)) {
                error = PTR_ERR(root);
                printk("Failure of coda_cnode_make for root: error %d\n", error);
-               root = NULL;
                goto error;
        } 
 
        printk("coda_read_super: rootinode is %ld dev %s\n", 
               root->i_ino, root->i_sb->s_id);
-       sb->s_root = d_alloc_root(root);
+       sb->s_root = d_make_root(root);
        if (!sb->s_root) {
                error = -EINVAL;
                goto error;
@@ -222,9 +220,6 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
        return 0;
 
 error:
-       if (root)
-               iput(root);
-
        mutex_lock(&vc->vc_mutex);
        bdi_destroy(&vc->bdi);
        vc->vc_sb = NULL;