[PATCH] xfs: fix inverted clearance of inode junk flags

[PATCH] xfs: fix inverted clearance of inode junk flags

[Andrey Albershteyn]

sashiko.dev noticed that these checks clear all the valid flags instead
of invalid. This probably was never hit as it only executed on invalid
flag presence.

Fixes: 2d295fe65776 ("xfs: repair inode records")
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
---
 fs/xfs/scrub/inode_repair.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/scrub/inode_repair.c b/fs/xfs/scrub/inode_repair.c
index 3ec41c198351..3fc9a12b494a 100644
--- a/fs/xfs/scrub/inode_repair.c
+++ b/fs/xfs/scrub/inode_repair.c
@@ -1797,7 +1797,7 @@ xrep_inode_flags(
 
 	/* Clear junk flags */
 	if (sc->ip->i_diflags & ~XFS_DIFLAG_ANY)
-		sc->ip->i_diflags &= ~XFS_DIFLAG_ANY;
+		sc->ip->i_diflags &= XFS_DIFLAG_ANY;
 
 	/* NEWRTBM only applies to realtime bitmaps */
 	if (I_INO(sc->ip) == sc->mp->m_sb.sb_rbmino)
@@ -1828,7 +1828,7 @@ xrep_inode_flags(
 
 	/* Clear junk flags. */
 	if (sc->ip->i_diflags2 & ~XFS_DIFLAG2_ANY)
-		sc->ip->i_diflags2 &= ~XFS_DIFLAG2_ANY;
+		sc->ip->i_diflags2 &= XFS_DIFLAG2_ANY;
 
 	/* No reflink flag unless we support it and it's a file. */
 	if (!xfs_has_reflink(sc->mp) || !S_ISREG(mode))
-- 
2.54.0

Re: [PATCH] xfs: fix inverted clearance of inode junk flags

[Darrick J. Wong]

On Wed, Jul 22, 2026 at 11:17:59AM +0200, Andrey Albershteyn wrote:
> sashiko.dev noticed that these checks clear all the valid flags instead
> of invalid. This probably was never hit as it only executed on invalid
> flag presence.
> 
> Fixes: 2d295fe65776 ("xfs: repair inode records")
> Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>

Heh, I have an identical patch in my pending fixes branch.  That makes
things easy:
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/scrub/inode_repair.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/scrub/inode_repair.c b/fs/xfs/scrub/inode_repair.c
> index 3ec41c198351..3fc9a12b494a 100644
> --- a/fs/xfs/scrub/inode_repair.c
> +++ b/fs/xfs/scrub/inode_repair.c
> @@ -1797,7 +1797,7 @@ xrep_inode_flags(
>  
>  	/* Clear junk flags */
>  	if (sc->ip->i_diflags & ~XFS_DIFLAG_ANY)
> -		sc->ip->i_diflags &= ~XFS_DIFLAG_ANY;
> +		sc->ip->i_diflags &= XFS_DIFLAG_ANY;
>  
>  	/* NEWRTBM only applies to realtime bitmaps */
>  	if (I_INO(sc->ip) == sc->mp->m_sb.sb_rbmino)
> @@ -1828,7 +1828,7 @@ xrep_inode_flags(
>  
>  	/* Clear junk flags. */
>  	if (sc->ip->i_diflags2 & ~XFS_DIFLAG2_ANY)
> -		sc->ip->i_diflags2 &= ~XFS_DIFLAG2_ANY;
> +		sc->ip->i_diflags2 &= XFS_DIFLAG2_ANY;
>  
>  	/* No reflink flag unless we support it and it's a file. */
>  	if (!xfs_has_reflink(sc->mp) || !S_ISREG(mode))
> -- 
> 2.54.0
> 
>