Commit 48f75df5 authored Apr 12, 2023 by Darrick J. Wong Committed by Greg Kroah-Hartman Apr 20, 2023

xfs: report corruption only as a regular error



commit 6519f708cc355c4834edbe1885c8542c0e7ef907 uptream.

[ Slightly modify fs/xfs/xfs_linux.h to resolve merge conflicts ]

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>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3cce34ce

fs/xfs/xfs_error.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@ xfs_corruption_error(
		int linenum,
		xfs_failaddr_t failaddr)
		{
		if (level <= xfs_error_level)
		if (buf && level <= xfs_error_level)
		xfs_hex_dump(buf, bufsize);
		xfs_error_report(tag, level, mp, filename, linenum, failaddr);
		xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair");

fs/xfs/xfs_linux.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,12 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,
		#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