4 files changed, 28 insertions, 50 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
index 657e3f233a64..c9500ea7be2f 100644
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -111,7 +111,7 @@ static int match_context(const void *v, struct file *file, unsigned fd)
         struct spu_context *ctx;
         if (file->f_op != &spufs_context_fops)
                 return 0;
-        ctx = SPUFS_I(file->f_dentry->d_inode)->i_ctx;
+        ctx = SPUFS_I(file_inode(file))->i_ctx;
         if (ctx->flags & SPU_CREATE_NOSCHED)
                 return 0;
         return fd + 1;
@@ -137,7 +137,7 @@ static struct spu_context *coredump_next_context(int *fd)
                 return NULL;
         *fd = n - 1;
         file = fcheck(*fd);
-        return SPUFS_I(file->f_dentry->d_inode)->i_ctx;
+        return SPUFS_I(file_inode(file))->i_ctx;
 }
 
 int spufs_coredump_extra_notes_size(void)
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 0cfece4cf6ef..68c57d38745a 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -1852,7 +1852,7 @@ out:
 
 static int spufs_mfc_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int err = filemap_write_and_wait_range(inode->i_mapping, start, end);
         if (!err) {
                 mutex_lock(&inode->i_mutex);
@@ -2501,7 +2501,7 @@ static int switch_log_sprint(struct spu_context *ctx, char *tbuf, int n)
 static ssize_t spufs_switch_log_read(struct file *file, char __user *buf,
                              size_t len, loff_t *ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct spu_context *ctx = SPUFS_I(inode)->i_ctx;
         int error = 0, cnt = 0;
 
@@ -2571,7 +2571,7 @@ static ssize_t spufs_switch_log_read(struct file *file, char __user *buf,
 
 static unsigned int spufs_switch_log_poll(struct file *file, poll_table *wait)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct spu_context *ctx = SPUFS_I(inode)->i_ctx;
         unsigned int mask = 0;
         int rc;
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index dba1ce235da5..863184b182f4 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -199,37 +199,18 @@ static int spufs_fill_dir(struct dentry *dir,
                 const struct spufs_tree_descr *files, umode_t mode,
                 struct spu_context *ctx)
 {
-        struct dentry *dentry, *tmp;
-        int ret;
-
         while (files->name && files->name[0]) {
-                ret = -ENOMEM;
-                dentry = d_alloc_name(dir, files->name);
+                int ret;
+                struct dentry *dentry = d_alloc_name(dir, files->name);
                 if (!dentry)
-                        goto out;
+                        return -ENOMEM;
                 ret = spufs_new_file(dir->d_sb, dentry, files->ops,
                                         files->mode & mode, files->size, ctx);
                 if (ret)
-                        goto out;
+                        return ret;
                 files++;
         }
         return 0;
-out:
-        /*
-         * remove all children from dir. dir->inode is not set so don't
-         * just simply use spufs_prune_dir() and panic afterwards :)
-         * dput() looks like it will do the right thing:
-         * - dec parent's ref counter
-         * - remove child from parent's child list
-         * - free child's inode if possible
-         * - free child
-         */
-        list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) {
-                dput(dentry);
-        }
-
-        shrink_dcache_parent(dir);
-        return ret;
 }
 
 static int spufs_dir_close(struct inode *inode, struct file *file)
@@ -269,10 +250,9 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
         struct inode *inode;
         struct spu_context *ctx;
 
-        ret = -ENOSPC;
         inode = spufs_new_inode(dir->i_sb, mode | S_IFDIR);
         if (!inode)
-                goto out;
+                return -ENOSPC;
 
         if (dir->i_mode & S_ISGID) {
                 inode->i_gid = dir->i_gid;
@@ -280,40 +260,38 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
         }
         ctx = alloc_spu_context(SPUFS_I(dir)->i_gang); /* XXX gang */
         SPUFS_I(inode)->i_ctx = ctx;
-        if (!ctx)
-                goto out_iput;
+        if (!ctx) {
+                iput(inode);
+                return -ENOSPC;
+        }
 
         ctx->flags = flags;
         inode->i_op = &simple_dir_inode_operations;
         inode->i_fop = &simple_dir_operations;
+
+        mutex_lock(&inode->i_mutex);
+
+        dget(dentry);
+        inc_nlink(dir);
+        inc_nlink(inode);
+
+        d_instantiate(dentry, inode);
+
         if (flags & SPU_CREATE_NOSCHED)
                 ret = spufs_fill_dir(dentry, spufs_dir_nosched_contents,
                                          mode, ctx);
         else
                 ret = spufs_fill_dir(dentry, spufs_dir_contents, mode, ctx);
 
-        if (ret)
-                goto out_free_ctx;
-
-        if (spufs_get_sb_info(dir->i_sb)->debug)
+        if (!ret && spufs_get_sb_info(dir->i_sb)->debug)
                 ret = spufs_fill_dir(dentry, spufs_dir_debug_contents,
                                 mode, ctx);
 
         if (ret)
-                goto out_free_ctx;
+                spufs_rmdir(dir, dentry);
 
-        d_instantiate(dentry, inode);
-        dget(dentry);
-        inc_nlink(dir);
-        inc_nlink(dentry->d_inode);
-        goto out;
+        mutex_unlock(&inode->i_mutex);
 
-out_free_ctx:
-        spu_forget(ctx);
-        put_spu_context(ctx);
-out_iput:
-        iput(inode);
-out:
         return ret;
 }
 
@@ -368,7 +346,7 @@ spufs_assert_affinity(unsigned int flags, struct spu_gang *gang,
                         return ERR_PTR(-EINVAL);
 
                 neighbor = get_spu_context(
-                                SPUFS_I(filp->f_dentry->d_inode)->i_ctx);
+                                SPUFS_I(file_inode(filp))->i_ctx);
 
                 if (!list_empty(&neighbor->aff_list) && !(neighbor->aff_head) &&
                     !list_is_last(&neighbor->aff_list, &gang->aff_list_head) &&
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index baee994fe810..b045fdda4845 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -47,7 +47,7 @@ static long do_spu_run(struct file *filp,
         if (filp->f_op != &spufs_context_fops)
                 goto out;
 
-        i = SPUFS_I(filp->f_path.dentry->d_inode);
+        i = SPUFS_I(file_inode(filp));
         ret = spufs_run_spu(i->i_ctx, &npc, &status);
 
         if (put_user(npc, unpc))