summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_linux.h
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2019-11-17 10:36:52 -0800
committerDarrick J. Wong <darrick.wong@oracle.com>2019-11-18 08:40:44 -0800
commit6519f708cc355c4834edbe1885c8542c0e7ef907 (patch)
tree103a04492185da1c34d9a30577360283d0ff2482 /fs/xfs/xfs_linux.h
parent377bcd5f3b7f46f50fdad1fed639c07f8c9f68cb (diff)
xfs: report corruption only as a regular error
Redefine XFS_IS_CORRUPT so that it reports corruptions only via xfs_corruption_report. Since these are on-disk contents (and not checks of internal state), we don't ever want to panic the kernel. This also amends the corruption report to recommend unmounting and running xfs_repair. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_linux.h')
-rw-r--r--fs/xfs/xfs_linux.h17
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 64bbbcc77851..8738bb03f253 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -229,10 +229,6 @@ 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
@@ -240,20 +236,19 @@ 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 XFS_IS_CORRUPT(mp, expr) \
- (unlikely(expr) ? XFS_ERROR_REPORT(#expr, XFS_ERRLEVEL_LOW, (mp)), \
- true : false)
#endif /* XFS_WARN */
#endif /* DEBUG */
+#define XFS_IS_CORRUPT(mp, expr) \
+ (unlikely(expr) ? xfs_corruption_error(#expr, XFS_ERRLEVEL_LOW, (mp), \
+ NULL, 0, __FILE__, __LINE__, \
+ __this_address), \
+ true : false)
+
#define STATIC static noinline
#ifdef CONFIG_XFS_RT