[PATCH] xfs: release alleged child inode on metapath unlink error

[PATCH] xfs: release alleged child inode on metapath unlink error

[Anuj Gupta]

If xchk_metapath_ilock_parent_and_child() fails after xchk_iget()
succeeds, release the inode reference before returning.

Fixes: 0d2c636e489c ("xfs: repair metadata directory file path connectivity")
Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
---
 fs/xfs/scrub/metapath.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/xfs/scrub/metapath.c b/fs/xfs/scrub/metapath.c
index ff1ff762b300..79fd69d2de68 100644
--- a/fs/xfs/scrub/metapath.c
+++ b/fs/xfs/scrub/metapath.c
@@ -550,6 +550,8 @@ xrep_metapath_try_unlink(
 	}
 	if (error) {
 		xchk_trans_cancel(sc);
+		if (ip)
+			xchk_irele(sc, ip);
 		return error;
 	}
 
-- 
2.25.1

Re: [PATCH] xfs: release alleged child inode on metapath unlink error

[Carlos Maiolino]

On Mon, Aug 31, 2026 at 12:11:57PM +0530, Anuj Gupta wrote:
> If xchk_metapath_ilock_parent_and_child() fails after xchk_iget()
> succeeds, release the inode reference before returning.
> 
> Fixes: 0d2c636e489c ("xfs: repair metadata directory file path connectivity")
> Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
> ---
>  fs/xfs/scrub/metapath.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/fs/xfs/scrub/metapath.c b/fs/xfs/scrub/metapath.c
> index ff1ff762b300..79fd69d2de68 100644
> --- a/fs/xfs/scrub/metapath.c
> +++ b/fs/xfs/scrub/metapath.c
> @@ -550,6 +550,8 @@ xrep_metapath_try_unlink(
>  	}
>  	if (error) {
>  		xchk_trans_cancel(sc);
> +		if (ip)
> +			xchk_irele(sc, ip);
>  		return error;
>  	}
>  

Looks good.

Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

> -- 
> 2.25.1
> 

Re: [PATCH] xfs: release alleged child inode on metapath unlink error

[Darrick J. Wong]

On Mon, Aug 31, 2026 at 12:11:57PM +0530, Anuj Gupta wrote:
> If xchk_metapath_ilock_parent_and_child() fails after xchk_iget()
> succeeds, release the inode reference before returning.
> 
> Fixes: 0d2c636e489c ("xfs: repair metadata directory file path connectivity")

I have a patch just like this one in my branch so

Cc: <stable@vger.kernel.org> # v6.13
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
> ---
>  fs/xfs/scrub/metapath.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/fs/xfs/scrub/metapath.c b/fs/xfs/scrub/metapath.c
> index ff1ff762b300..79fd69d2de68 100644
> --- a/fs/xfs/scrub/metapath.c
> +++ b/fs/xfs/scrub/metapath.c
> @@ -550,6 +550,8 @@ xrep_metapath_try_unlink(
>  	}
>  	if (error) {
>  		xchk_trans_cancel(sc);
> +		if (ip)
> +			xchk_irele(sc, ip);
>  		return error;
>  	}
>  
> -- 
> 2.25.1
> 
> 

Re: [PATCH] xfs: release alleged child inode on metapath unlink error

[Anuj Gupta/Anuj Gupta]

On 8/31/2026 7:46 PM, Darrick J. Wong wrote:
> On Mon, Aug 31, 2026 at 12:11:57PM +0530, Anuj Gupta wrote:
>> If xchk_metapath_ilock_parent_and_child() fails after xchk_iget()
>> succeeds, release the inode reference before returning.
>>
>> Fixes: 0d2c636e489c ("xfs: repair metadata directory file path connectivity")
> 
> I have a patch just like this one in my branch so
> 
> Cc: <stable@vger.kernel.org> # v6.13
> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
> 

I noticed that the hunk was placed in the wrong location. It belongs 
after xchk_metapath_ilock_parent_and_child() where the leak can occur. 
The implementation doesn't match the commit description. Really sorry 
for the noise; I will send a v2.

> --D
> 
>> Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
>> ---
>>   fs/xfs/scrub/metapath.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/fs/xfs/scrub/metapath.c b/fs/xfs/scrub/metapath.c
>> index ff1ff762b300..79fd69d2de68 100644
>> --- a/fs/xfs/scrub/metapath.c
>> +++ b/fs/xfs/scrub/metapath.c
>> @@ -550,6 +550,8 @@ xrep_metapath_try_unlink(
>>   	}
>>   	if (error) {
>>   		xchk_trans_cancel(sc);
>> +		if (ip)
>> +			xchk_irele(sc, ip);
>>   		return error;
>>   	}
>>   
>> -- 
>> 2.25.1
>>
>>
>