2 files changed, 26 insertions, 53 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index d544d7816df..dba1ce235da 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -186,10 +186,13 @@ static void spufs_prune_dir(struct dentry *dir)
 static int spufs_rmdir(struct inode *parent, struct dentry *dir)
 {
         /* remove all entries */
+        int res;
         spufs_prune_dir(dir);
         d_drop(dir);
-
-        return simple_rmdir(parent, dir);
+        res = simple_rmdir(parent, dir);
+        /* We have to give up the mm_struct */
+        spu_forget(SPUFS_I(dir->d_inode)->i_ctx);
+        return res;
 }
 
 static int spufs_fill_dir(struct dentry *dir,
@@ -245,9 +248,6 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
         mutex_unlock(&parent->i_mutex);
         WARN_ON(ret);
 
-        /* We have to give up the mm_struct */
-        spu_forget(ctx);
-
         return dcache_dir_close(inode, file);
 }
 
@@ -450,28 +450,24 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
         struct spu_context *neighbor;
         struct path path = {.mnt = mnt, .dentry = dentry};
 
-        ret = -EPERM;
         if ((flags & SPU_CREATE_NOSCHED) &&
             !capable(CAP_SYS_NICE))
-                goto out_unlock;
+                return -EPERM;
 
-        ret = -EINVAL;
         if ((flags & (SPU_CREATE_NOSCHED | SPU_CREATE_ISOLATE))
             == SPU_CREATE_ISOLATE)
-                goto out_unlock;
+                return -EINVAL;
 
-        ret = -ENODEV;
         if ((flags & SPU_CREATE_ISOLATE) && !isolated_loader)
-                goto out_unlock;
+                return -ENODEV;
 
         gang = NULL;
         neighbor = NULL;
         affinity = flags & (SPU_CREATE_AFFINITY_MEM | SPU_CREATE_AFFINITY_SPU);
         if (affinity) {
                 gang = SPUFS_I(inode)->i_gang;
-                ret = -EINVAL;
                 if (!gang)
-                        goto out_unlock;
+                        return -EINVAL;
                 mutex_lock(&gang->aff_mutex);
                 neighbor = spufs_assert_affinity(flags, gang, aff_filp);
                 if (IS_ERR(neighbor)) {
@@ -492,22 +488,12 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
         }
 
         ret = spufs_context_open(&path);
-        if (ret < 0) {
+        if (ret < 0)
                 WARN_ON(spufs_rmdir(inode, dentry));
-                if (affinity)
-                        mutex_unlock(&gang->aff_mutex);
-                mutex_unlock(&inode->i_mutex);
-                spu_forget(SPUFS_I(dentry->d_inode)->i_ctx);
-                goto out;
-        }
 
 out_aff_unlock:
         if (affinity)
                 mutex_unlock(&gang->aff_mutex);
-out_unlock:
-        mutex_unlock(&inode->i_mutex);
-out:
-        dput(dentry);
         return ret;
 }
 
@@ -580,18 +566,13 @@ static int spufs_create_gang(struct inode *inode,
         int ret;
 
         ret = spufs_mkgang(inode, dentry, mode & S_IRWXUGO);
-        if (ret)
-                goto out;
-
-        ret = spufs_gang_open(&path);
-        if (ret < 0) {
-                int err = simple_rmdir(inode, dentry);
-                WARN_ON(err);
+        if (!ret) {
+                ret = spufs_gang_open(&path);
+                if (ret < 0) {
+                        int err = simple_rmdir(inode, dentry);
+                        WARN_ON(err);
+                }
         }
-
-out:
-        mutex_unlock(&inode->i_mutex);
-        dput(dentry);
         return ret;
 }
 
@@ -601,40 +582,32 @@ static struct file_system_type spufs_type;
 long spufs_create(struct path *path, struct dentry *dentry,
                 unsigned int flags, umode_t mode, struct file *filp)
 {
+        struct inode *dir = path->dentry->d_inode;
         int ret;
 
-        ret = -EINVAL;
         /* check if we are on spufs */
         if (path->dentry->d_sb->s_type != &spufs_type)
-                goto out;
+                return -EINVAL;
 
         /* don't accept undefined flags */
         if (flags & (~SPU_CREATE_FLAG_ALL))
-                goto out;
+                return -EINVAL;
 
         /* only threads can be underneath a gang */
-        if (path->dentry != path->dentry->d_sb->s_root) {
-                if ((flags & SPU_CREATE_GANG) ||
-                    !SPUFS_I(path->dentry->d_inode)->i_gang)
-                        goto out;
-        }
+        if (path->dentry != path->dentry->d_sb->s_root)
+                if ((flags & SPU_CREATE_GANG) || !SPUFS_I(dir)->i_gang)
+                        return -EINVAL;
 
         mode &= ~current_umask();
 
         if (flags & SPU_CREATE_GANG)
-                ret = spufs_create_gang(path->dentry->d_inode,
-                                         dentry, path->mnt, mode);
+                ret = spufs_create_gang(dir, dentry, path->mnt, mode);
         else
-                ret = spufs_create_context(path->dentry->d_inode,
-                                            dentry, path->mnt, flags, mode,
+                ret = spufs_create_context(dir, dentry, path->mnt, flags, mode,
                                             filp);
         if (ret >= 0)
-                fsnotify_mkdir(path->dentry->d_inode, dentry);
-        return ret;
+                fsnotify_mkdir(dir, dentry);
 
-out:
-        mutex_unlock(&path->dentry->d_inode->i_mutex);
-        dput(dentry);
         return ret;
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index 5665dcc382c..5b7d8ffbf89 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -70,7 +70,7 @@ static long do_spu_create(const char __user *pathname, unsigned int flags,
         ret = PTR_ERR(dentry);
         if (!IS_ERR(dentry)) {
                 ret = spufs_create(&path, dentry, flags, mode, neighbor);
-                path_put(&path);
+                done_path_create(&path, dentry);
         }
 
         return ret;