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

Commit ca23f8fd authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: add xfs_verifier_error() 



We want to distinguish between corruption, CRC errors,
etc.  In addition, the full stack trace on verifier errors
seems less than helpful; it looks more like an oops than
corruption.

Create a new function to specifically alert the user to
verifier errors, which can differentiate between
EFSCORRUPTED and CRC mismatches.  It doesn't dump stack
unless the xfs error level is turned up high.

Define a new error message (EFSBADCRC) to clearly identify
CRC errors.  (Defined to EBADMSG, bad message)

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent f1dbcd7e

fs/xfs/xfs_error.c

+25 −0
Original line number Original line Diff line number Diff line
@@ -178,3 +178,28 @@ xfs_corruption_error( 
	xfs_error_report(tag, level, mp, filename, linenum, ra);

	xfs_error_report(tag, level, mp, filename, linenum, ra);

	xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair");

	xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair");

}

}



/*

 * Warnings specifically for verifier errors.  Differentiate CRC vs. invalid

 * values, and omit the stack trace unless the error level is tuned high.

 */

void

xfs_verifier_error(

	struct xfs_buf		*bp)

{

	struct xfs_mount *mp = bp->b_target->bt_mount;



	xfs_alert(mp, "Metadata %s detected at %pF, block 0x%llx",

		  bp->b_error == EFSBADCRC ? "CRC error" : "corruption",

		  __return_address, bp->b_bn);



	xfs_alert(mp, "Unmount and run xfs_repair");



	if (xfs_error_level >= XFS_ERRLEVEL_LOW) {

		xfs_alert(mp, "First 64 bytes of corrupted metadata buffer:");

		xfs_hex_dump(xfs_buf_offset(bp, 0), 64);

	}



	if (xfs_error_level >= XFS_ERRLEVEL_HIGH)

		xfs_stack_trace();

}

fs/xfs/xfs_error.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp, 
extern void xfs_corruption_error(const char *tag, int level,

extern void xfs_corruption_error(const char *tag, int level,

			struct xfs_mount *mp, void *p, const char *filename,

			struct xfs_mount *mp, void *p, const char *filename,

			int linenum, inst_t *ra);

			int linenum, inst_t *ra);

extern void xfs_verifier_error(struct xfs_buf *bp);





#define	XFS_ERROR_REPORT(e, lvl, mp)	\

#define	XFS_ERROR_REPORT(e, lvl, mp)	\

	xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address)

	xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address)

fs/xfs/xfs_linux.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -179,6 +179,7 @@ typedef __uint64_t __psunsigned_t; 
#define ENOATTR		ENODATA		/* Attribute not found */

#define ENOATTR		ENODATA		/* Attribute not found */

#define EWRONGFS	EINVAL		/* Mount with wrong filesystem type */

#define EWRONGFS	EINVAL		/* Mount with wrong filesystem type */

#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */

#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */

#define EFSBADCRC	EBADMSG		/* Bad CRC detected */





#define SYNCHRONIZE()	barrier()

#define SYNCHRONIZE()	barrier()

#define __return_address __builtin_return_address(0)

#define __return_address __builtin_return_address(0)