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 <[email protected]> > Cc: "Darrick J. Wong" <[email protected]> > Cc: Joe Perches <[email protected]> > Cc: Andrew Morton <[email protected]> > Cc: [email protected]
LGTM, Reviewed-by: Darrick J. Wong <[email protected]> --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 >
