浏览代码

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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Amir Goldstein 8 年之前
父节点
当前提交
bf46ecc3d8
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      fs/xfs/xfs_linux.h

+ 3 - 3
fs/xfs/xfs_linux.h

@@ -331,11 +331,11 @@ static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y)
 }
 }
 
 
 #define ASSERT_ALWAYS(expr)	\
 #define ASSERT_ALWAYS(expr)	\
-	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
+	(likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
 
 
 #ifdef DEBUG
 #ifdef DEBUG
 #define ASSERT(expr)	\
 #define ASSERT(expr)	\
-	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
+	(likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
 
 
 #ifndef STATIC
 #ifndef STATIC
 # define STATIC noinline
 # define STATIC noinline
@@ -346,7 +346,7 @@ static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y)
 #ifdef XFS_WARN
 #ifdef XFS_WARN
 
 
 #define ASSERT(expr)	\
 #define ASSERT(expr)	\
-	(unlikely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__))
+	(likely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__))
 
 
 #ifndef STATIC
 #ifndef STATIC
 # define STATIC static noinline
 # define STATIC static noinline