leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spufs: pull unlock-and-dput() up into spufs_create()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-07-19 16:12:22 +04:00
parent 66ec7b2cd0
commit 1ba44cc970
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/powerpc/platforms/cell/spufs/inode.c
View File

@ -450,28 +450,24 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
struct spu_context *neighbor; struct spu_context *neighbor;
struct path path = {.mnt = mnt, .dentry = dentry}; struct path path = {.mnt = mnt, .dentry = dentry};
ret = -EPERM;
if ((flags & SPU_CREATE_NOSCHED) && if ((flags & SPU_CREATE_NOSCHED) &&
!capable(CAP_SYS_NICE)) !capable(CAP_SYS_NICE))
goto out_unlock; return -EPERM;
ret = -EINVAL;
if ((flags & (SPU_CREATE_NOSCHED | SPU_CREATE_ISOLATE)) if ((flags & (SPU_CREATE_NOSCHED | SPU_CREATE_ISOLATE))
== SPU_CREATE_ISOLATE) == SPU_CREATE_ISOLATE)
goto out_unlock; return -EINVAL;
ret = -ENODEV;
if ((flags & SPU_CREATE_ISOLATE) && !isolated_loader) if ((flags & SPU_CREATE_ISOLATE) && !isolated_loader)
goto out_unlock; return -ENODEV;
gang = NULL; gang = NULL;
neighbor = NULL; neighbor = NULL;
affinity = flags & (SPU_CREATE_AFFINITY_MEM | SPU_CREATE_AFFINITY_SPU); affinity = flags & (SPU_CREATE_AFFINITY_MEM | SPU_CREATE_AFFINITY_SPU);
if (affinity) { if (affinity) {
gang = SPUFS_I(inode)->i_gang; gang = SPUFS_I(inode)->i_gang;
ret = -EINVAL;
if (!gang) if (!gang)
goto out_unlock; return -EINVAL;
mutex_lock(&gang->aff_mutex); mutex_lock(&gang->aff_mutex);
neighbor = spufs_assert_affinity(flags, gang, aff_filp); neighbor = spufs_assert_affinity(flags, gang, aff_filp);
if (IS_ERR(neighbor)) { if (IS_ERR(neighbor)) {
@ -498,9 +494,6 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
out_aff_unlock: out_aff_unlock:
if (affinity) if (affinity)
mutex_unlock(&gang->aff_mutex); mutex_unlock(&gang->aff_mutex);
out_unlock:
mutex_unlock(&inode->i_mutex);
dput(dentry);
return ret; return ret;
} }
@ -573,18 +566,13 @@ static int spufs_create_gang(struct inode *inode,
int ret; int ret;
ret = spufs_mkgang(inode, dentry, mode & S_IRWXUGO); ret = spufs_mkgang(inode, dentry, mode & S_IRWXUGO);
if (ret) if (!ret) {
goto out;
ret = spufs_gang_open(&path); ret = spufs_gang_open(&path);
if (ret < 0) { if (ret < 0) {
int err = simple_rmdir(inode, dentry); int err = simple_rmdir(inode, dentry);
WARN_ON(err); WARN_ON(err);
} }
}
out:
mutex_unlock(&inode->i_mutex);
dput(dentry);
return ret; return ret;
} }
@ -623,7 +611,6 @@ long spufs_create(struct path *path, struct dentry *dentry,
filp); filp);
if (ret >= 0) if (ret >= 0)
fsnotify_mkdir(path->dentry->d_inode, dentry); fsnotify_mkdir(path->dentry->d_inode, dentry);
return ret;
out: out:
mutex_unlock(&path->dentry->d_inode->i_mutex); mutex_unlock(&path->dentry->d_inode->i_mutex);