Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14ed8688 authored by Denis Efremov's avatar Denis Efremov Committed by Linus Torvalds
Browse files

xfs: remove unlikely() from WARN_ON() condition 

"unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely()
internally.

Link: http://lkml.kernel.org/r/20190829165025.15750-7-efremov@linux.com


Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77c0e745

fs/xfs/xfs_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -2097,7 +2097,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];

}
@@ -2115,7 +2115,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];

}