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

Commit bf46ecc3 authored by Amir Goldstein's avatar Amir Goldstein Committed by Darrick J. Wong
Browse files

xfs: make the ASSERT() condition likely 



The ASSERT() condition is the normal case, not the exception,
so testing the condition should be likely(), not unlikely().

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 49def185

fs/xfs/xfs_linux.h

+3 −3
Original line number Diff line number Diff line
@@ -331,11 +331,11 @@ static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y) 
}



#define ASSERT_ALWAYS(expr)	\

	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))

	(likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))



#ifdef DEBUG

#define ASSERT(expr)	\

	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))

	(likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))



#ifndef STATIC

# define STATIC noinline
@@ -346,7 +346,7 @@ static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y) 
#ifdef XFS_WARN



#define ASSERT(expr)	\

	(unlikely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__))

	(likely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__))



#ifndef STATIC

# define STATIC static noinline