linux-kernel - Re: [PATCH v3 07/11] xfs: remove unlikely() from WARN

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190829212232.GN5354@magnolia>
Date:   Thu, 29 Aug 2019 14:22:32 -0700
From:   "Darrick J. Wong" <darrick.wong@...cle.com>
To:     Denis Efremov <efremov@...ux.com>
Cc:     linux-kernel@...r.kernel.org, Joe Perches <joe@...ches.com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        linux-xfs@...r.kernel.org
Subject: Re: [PATCH v3 07/11] xfs: remove unlikely() from WARN_ON() condition

On Thu, Aug 29, 2019 at 07:50:21PM +0300, Denis Efremov wrote:
> "unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely()
> internally.
> 
> Signed-off-by: Denis Efremov <efremov@...ux.com>
> Cc: "Darrick J. Wong" <darrick.wong@...cle.com>
> Cc: Joe Perches <joe@...ches.com>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: linux-xfs@...r.kernel.org

LGTM,
Reviewed-by: Darrick J. Wong <darrick.wong@...cle.com>

--D

> ---
>  fs/xfs/xfs_buf.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index ca0849043f54..4389d87ff0f0 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -2096,7 +2096,7 @@ xfs_verify_magic(
>  	int			idx;
>  
>  	idx = xfs_sb_version_hascrc(&mp->m_sb);
> -	if (unlikely(WARN_ON(!bp->b_ops || !bp->b_ops->magic[idx])))
> +	if (WARN_ON(!bp->b_ops || !bp->b_ops->magic[idx]))
>  		return false;
>  	return dmagic == bp->b_ops->magic[idx];
>  }
> @@ -2114,7 +2114,7 @@ xfs_verify_magic16(
>  	int			idx;
>  
>  	idx = xfs_sb_version_hascrc(&mp->m_sb);
> -	if (unlikely(WARN_ON(!bp->b_ops || !bp->b_ops->magic16[idx])))
> +	if (WARN_ON(!bp->b_ops || !bp->b_ops->magic16[idx]))
>  		return false;
>  	return dmagic == bp->b_ops->magic16[idx];
>  }
> -- 
> 2.21.0
>