xfs: add a XFS_IS_CORRUPT macro

Add a new macro, XFS_IS_CORRUPT, which we will use to integrate some
corruption reporting when the corruption test expression is true.  This
will be used in the next patch to remove the ugly XFS_WANT_CORRUPT*
macros.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 2271db4e8d661893c1894a80a90d7341bd22d487..64bbbcc77851c4ea7cfa0986131bccfac06fbb4c 100644 (file)
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -229,6 +229,10 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,
 #define ASSERT(expr)   \
        (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))
 
+#define XFS_IS_CORRUPT(mp, expr)       \
+       (unlikely(expr) ? assfail((mp), #expr, __FILE__, __LINE__), \
+                         true : false)
+
 #else  /* !DEBUG */
 
 #ifdef XFS_WARN
@@ -236,9 +240,16 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,
 #define ASSERT(expr)   \
        (likely(expr) ? (void)0 : asswarn(NULL, #expr, __FILE__, __LINE__))
 
+#define XFS_IS_CORRUPT(mp, expr)       \
+       (unlikely(expr) ? asswarn((mp), #expr, __FILE__, __LINE__), \
+                         true : false)
+
 #else  /* !DEBUG && !XFS_WARN */
 
-#define ASSERT(expr)   ((void)0)
+#define ASSERT(expr)           ((void)0)
+#define XFS_IS_CORRUPT(mp, expr)       \
+       (unlikely(expr) ? XFS_ERROR_REPORT(#expr, XFS_ERRLEVEL_LOW, (mp)), \
+                         true : false)
 
 #endif /* XFS_WARN */
 #endif /* DEBUG */