On Wed, Jun 07, 2006 at 05:10:15PM -0700, Dave Hansen wrote:
>
> We're going to add another condition here in a minute, so
> add a goto instead of an if.
>
> There will be a lot of patches like this one. They may seem
> too finely-grained, but I did encounter a couple of bugs where
> I botched one of these. If there is a bug in one, this level
> of granularity will really help to track them down with a
> chop-search.
Acked-by: Herbert Poetzl <herbert@xxxxxxxxxxxx>
> Signed-off-by: Dave Hansen <haveblue@xxxxxxxxxx>
> ---
>
> lxc-dave/fs/namei.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff -puN fs/namei.c~rmdir fs/namei.c
> --- lxc/fs/namei.c~rmdir 2006-06-07 16:53:12.000000000 -0700
> +++ lxc-dave/fs/namei.c 2006-06-07 16:53:12.000000000 -0700
> @@ -2010,10 +2010,11 @@ static long do_rmdir(int dfd, const char
> mutex_lock_nested(&nd.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
> dentry = lookup_hash(&nd);
> error = PTR_ERR(dentry);
> - if (!IS_ERR(dentry)) {
> - error = vfs_rmdir(nd.dentry->d_inode, dentry);
> - dput(dentry);
> - }
> + if (IS_ERR(dentry))
> + goto exit2;
> + error = vfs_rmdir(nd.dentry->d_inode, dentry);
> + dput(dentry);
> +exit2:
> mutex_unlock(&nd.dentry->d_inode->i_mutex);
> exit1:
> path_release(&nd);
> _
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
