diff mbox series

xfs: fix incorrect error-out in xfs_remove

Message ID Y2mw3oZ2YVyReWeg@magnolia (mailing list archive)
State Accepted
Headers show
Series xfs: fix incorrect error-out in xfs_remove | expand

Commit Message

Darrick J. Wong Nov. 8, 2022, 1:29 a.m. UTC 
From: Darrick J. Wong <djwong@kernel.org>

Clean up resources if resetting the dotdot entry doesn't succeed.
Observed through code inspection.

Fixes: 5838d0356bb3 ("xfs: reset child dir '..' entry when unlinking child")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 fs/xfs/xfs_inode.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrey Albershteyn Nov. 8, 2022, 9:59 a.m. UTC | #1 
On Mon, Nov 07, 2022 at 05:29:02PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Clean up resources if resetting the dotdot entry doesn't succeed.
> Observed through code inspection.
> 
> Fixes: 5838d0356bb3 ("xfs: reset child dir '..' entry when unlinking child")
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
>  fs/xfs/xfs_inode.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index aa303be11576..d354ea2b74f9 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2479,7 +2479,7 @@ xfs_remove(
>  			error = xfs_dir_replace(tp, ip, &xfs_name_dotdot,
>  					tp->t_mountp->m_sb.sb_rootino, 0);
>  			if (error)
> -				return error;
> +				goto out_trans_cancel;
>  		}
>  	} else {
>  		/*
> 

Looks good to me.
Reviewed-by: Andrey Albershteyn <aalbersh@redhat.com>
diff mbox series

Patch

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index aa303be11576..d354ea2b74f9 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2479,7 +2479,7 @@  xfs_remove(
 			error = xfs_dir_replace(tp, ip, &xfs_name_dotdot,
 					tp->t_mountp->m_sb.sb_rootino, 0);
 			if (error)
-				return error;
+				goto out_trans_cancel;
 		}
 	} else {
 		/*