Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[linux-flexiantxendom0-3.2.10.git] / arch / powerpc / platforms / cell / spufs / inode.c

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 114ab14..1d75c92 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -758,9 +758,9 @@ spufs_create_root(struct super_block *sb, void *data)
                goto out_iput;
 
        ret = -ENOMEM;
-       sb->s_root = d_alloc_root(inode);
+       sb->s_root = d_make_root(inode);
        if (!sb->s_root)
-               goto out_iput;
+               goto out;
 
        return 0;
 out_iput:
@@ -829,19 +829,19 @@ static int __init spufs_init(void)
        ret = spu_sched_init();
        if (ret)
                goto out_cache;
-       ret = register_filesystem(&spufs_type);
+       ret = register_spu_syscalls(&spufs_calls);
        if (ret)
                goto out_sched;
-       ret = register_spu_syscalls(&spufs_calls);
+       ret = register_filesystem(&spufs_type);
        if (ret)
-               goto out_fs;
+               goto out_syscalls;
 
        spufs_init_isolated_loader();
 
        return 0;
 
-out_fs:
-       unregister_filesystem(&spufs_type);
+out_syscalls:
+       unregister_spu_syscalls(&spufs_calls);
 out_sched:
        spu_sched_exit();
 out_cache: