spufs: Minor cleanups
Subsystems (3)
cover spufs: Minor cleanups
Arnd,
here are some minor cleanups that I think are worth doing. I had them in my union mount queue because I had some changes to lookup_create() planned.
Cheers,
Jan
PATCH 2/2 spufs: remove double check for non-negative dentry
This patch removes an unnecessary double check if the dentry returned by lookup_create() is actually non-negative. Since lookup_create() itself returns an error in this case just remove the check.
--- arch/powerpc/platforms/cell/spufs/inode.c | 4 ---- 1 file changed, 4 deletions(-)
arch/powerpc/platforms/cell/spufs/inode.c +0 -4
@@ -625,10 +625,6 @@ long spufs_create(struct nameidata *nd,if (IS_ERR (dentry)) goto out_dir; - ret = -EEXIST ; -if (dentry->d_inode) - goto out_dput; - mode &= ~current->fs->umask;if (flags &SPU_CREATE_GANG )
PATCH 1/2 spufs: make dentry reference count and locking symmetric
In reply to [email protected]This patch moves the dput() and the parent inode locking to the same function.
--- arch/powerpc/platforms/cell/spufs/inode.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
arch/powerpc/platforms/cell/spufs/inode.c +4 -10
@@ -450,16 +450,16 @@ spufs_create_context(struct inode *inode ret = -EPERM ;if ((flags &SPU_CREATE_NOSCHED ) && !capable (CAP_SYS_NICE )) - goto out_unlock; + goto out; ret = -EINVAL ;if ((flags & (SPU_CREATE_NOSCHED |SPU_CREATE_ISOLATE )) ==SPU_CREATE_ISOLATE ) - goto out_unlock; + goto out; ret = -ENODEV ;if ((flags &SPU_CREATE_ISOLATE ) && !isolated_loader) - goto out_unlock; + goto out; gang =NULL ; neighbor =NULL ;
@@ -468,7 +468,7 @@ spufs_create_context(struct inode *inode gang =SPUFS_I (inode)->i_gang; ret = -EINVAL ;if (!gang) - goto out_unlock; + goto out;mutex_lock (&gang->aff_mutex); neighbor =spufs_assert_affinity (flags, gang, aff_filp);if (IS_ERR (neighbor)) {
@@ -505,10 +505,7 @@ spufs_create_context(struct inode *inode out_aff_unlock:if (affinity)mutex_unlock (&gang->aff_mutex); -out_unlock: -mutex_unlock (&inode->i_mutex); out: -dput (dentry);return ret; }
@@ -595,8 +592,6 @@ static int spufs_create_gang(struct inod } out: -mutex_unlock (&inode->i_mutex); -dput (dentry);return ret; }
@@ -645,7 +640,6 @@ long spufs_create(struct nameidata *nd, filp);if (ret >=0 )fsnotify_mkdir (nd->path.dentry->d_inode, dentry); -return ret; out_dput:dput (dentry);
Re: [patch 1/2] spufs: make dentry reference count and locking symmetric
Quoted 11 lines · On Tuesday 05 May 2009, [email protected] wrote:
(quoted diff) +0
-0@@ -505,10 +505,7 @@ spufs_create_context(struct inode *inodeout_aff_unlock:
if (affinity)
mutex_unlock(&gang->aff_mutex);
-out_unlock:
- mutex_unlock(&inode->i_mutex);
out:
- dput(dentry);
return ret;
}
There is a nasty deadlock problem with spu_forget(), which we must call after unlocking i_mutex but before the final dput, IIRC.
The path down there is something like
spu_forget -> mmput -> exit_mmap -> remove_vma ->
fput -> dput -> dentry_iput -> iput -> iput_final -> spufs_delete_inode -> destroy_spu_context. Arnd <><
Re: [patch 2/2] spufs: remove double check for non-negative dentry
In reply to [email protected]Quoted 5 lines · On Tuesday 05 May 2009, [email protected] wrote:
This patch removes an unnecessary double check if the dentry returned by
lookup_create()is actually non-negative. Sincelookup_create()itself returns an error in this case just remove the check.Signed-off-by Jan Blunck <[email protected]>
Looks good, I'll push this one on, unless Jeremy has objections.
Thanks,
Arnd <><
Quoted 14 lines
arch/powerpc/platforms/cell/spufs/inode.c +0
-4@@ -625,10 +625,6 @@ long spufs_create(struct nameidata *nd,if (IS_ERR (dentry)) goto out_dir; - ret = -EEXIST ; -if (dentry->d_inode) - goto out_dput; - mode &= ~current->fs->umask;if (flags &SPU_CREATE_GANG )