Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile 1 from Al Viro:
 "This is _not_ all; in particular, Miklos' and Jan's stuff is not there
  yet."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)
  ext4: initialization of ext4_li_mtx needs to be done earlier
  debugfs-related mode_t whack-a-mole
  hfsplus: add an ioctl to bless files
  hfsplus: change finder_info to u32
  hfsplus: initialise userflags
  qnx4: new helper - try_extent()
  qnx4: get rid of qnx4_bread/qnx4_getblk
  take removal of PF_FORKNOEXEC to flush_old_exec()
  trim includes in inode.c
  um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't hold it
  um: embed ->stub_pages[] into mmu_context
  gadgetfs: list_for_each_safe() misuse
  ocfs2: fix leaks on failure exits in module_init
  ecryptfs: make register_filesystem() the last potential failure exit
  ntfs: forgets to unregister sysctls on register_filesystem() failure
  logfs: missing cleanup on register_filesystem() failure
  jfs: mising cleanup on register_filesystem() failure
  make configfs_pin_fs() return root dentry on success
  configfs: configfs_create_dir() has parent dentry in dentry->d_parent
  configfs: sanitize configfs_create()
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index d4a094ca96f3..4a3d90e0d426 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -757,9 +757,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:
@@ -828,19 +828,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: