[PATCH] libxfs: Remove pointless crc flag check from xfs_agfl_verify

[PATCH] libxfs: Remove pointless crc flag check from xfs_agfl_verify

[cem]

From: Carlos Maiolino <cem@kernel.org>

Just a small clean up.
xfs_agfl_verify() is only called from xfs_agfl_{read,write}_verify()
helpers.
Both of them already check if crc is enabled, there seems to be no
reason for checking for it again.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
 fs/xfs/libxfs/xfs_alloc.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index 3d33e17f2e5c..619e6d6570f8 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -787,9 +787,6 @@ xfs_agfl_verify(
 	__be32		*agfl_bno = xfs_buf_to_agfl_bno(bp);
 	int		i;
 
-	if (!xfs_has_crc(mp))
-		return NULL;
-
 	if (!xfs_verify_magic(bp, agfl->agfl_magicnum))
 		return __this_address;
 	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))
-- 
2.47.1

Re: [PATCH] libxfs: Remove pointless crc flag check from xfs_agfl_verify

[Darrick J. Wong]

On Thu, Jan 16, 2025 at 05:32:56PM +0100, cem@kernel.org wrote:
> From: Carlos Maiolino <cem@kernel.org>
> 
> Just a small clean up.
> xfs_agfl_verify() is only called from xfs_agfl_{read,write}_verify()
> helpers.
> Both of them already check if crc is enabled, there seems to be no
> reason for checking for it again.

...but it does get called via ->verify_struct, which in turn is called
by online fsck and buffer log item "precommit" if
CONFIG_XFS_DEBUG_EXPENSIVE=y, so please don't remove this check.

--D

> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> ---
>  fs/xfs/libxfs/xfs_alloc.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 3d33e17f2e5c..619e6d6570f8 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -787,9 +787,6 @@ xfs_agfl_verify(
>  	__be32		*agfl_bno = xfs_buf_to_agfl_bno(bp);
>  	int		i;
>  
> -	if (!xfs_has_crc(mp))
> -		return NULL;
> -
>  	if (!xfs_verify_magic(bp, agfl->agfl_magicnum))
>  		return __this_address;
>  	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))
> -- 
> 2.47.1
> 
> 

Re: [PATCH] libxfs: Remove pointless crc flag check from xfs_agfl_verify

[Carlos Maiolino]

On Thu, Jan 16, 2025 at 08:53:52AM -0800, Darrick J. Wong wrote:
> On Thu, Jan 16, 2025 at 05:32:56PM +0100, cem@kernel.org wrote:
> > From: Carlos Maiolino <cem@kernel.org>
> > 
> > Just a small clean up.
> > xfs_agfl_verify() is only called from xfs_agfl_{read,write}_verify()
> > helpers.
> > Both of them already check if crc is enabled, there seems to be no
> > reason for checking for it again.
> 
> ...but it does get called via ->verify_struct, which in turn is called
> by online fsck and buffer log item "precommit" if
> CONFIG_XFS_DEBUG_EXPENSIVE=y, so please don't remove this check.

Woops, true that, my cscope didn't find it somehow :( Thanks for the heads up.


> 
> --D
> 
> > Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> > ---
> >  fs/xfs/libxfs/xfs_alloc.c | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> > index 3d33e17f2e5c..619e6d6570f8 100644
> > --- a/fs/xfs/libxfs/xfs_alloc.c
> > +++ b/fs/xfs/libxfs/xfs_alloc.c
> > @@ -787,9 +787,6 @@ xfs_agfl_verify(
> >  	__be32		*agfl_bno = xfs_buf_to_agfl_bno(bp);
> >  	int		i;
> >  
> > -	if (!xfs_has_crc(mp))
> > -		return NULL;
> > -
> >  	if (!xfs_verify_magic(bp, agfl->agfl_magicnum))
> >  		return __this_address;
> >  	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))
> > -- 
> > 2.47.1
> > 
> > 
>