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

Commit 6e204b9e authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: xfs_buf_corruption_error should take __this_address 



commit e83cf875d67a6cb9ddfaa8b45d2fa93d12b5c66f upstream.

Add a xfs_failaddr_t parameter to this function so that callers can
potentially pass in (and therefore report) the exact point in the code
where we decided that a metadata buffer was corrupt.  This enables us to
wire it up to checking functions that have to run outside of verifiers.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0213ee5f

fs/xfs/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ __xfs_buf_mark_corrupt( 
{

	ASSERT(bp->b_flags & XBF_DONE);



	xfs_buf_corruption_error(bp);

	xfs_buf_corruption_error(bp, fa);

	xfs_buf_stale(bp);

}

fs/xfs/xfs_error.c

+3 −2
Original line number Diff line number Diff line
@@ -350,13 +350,14 @@ xfs_corruption_error( 
 */

void

xfs_buf_corruption_error(

	struct xfs_buf		*bp)

	struct xfs_buf		*bp,

	xfs_failaddr_t		fa)

{

	struct xfs_mount	*mp = bp->b_mount;



	xfs_alert_tag(mp, XFS_PTAG_VERIFIER_ERROR,

		  "Metadata corruption detected at %pS, %s block 0x%llx",

		  __return_address, bp->b_ops->name, bp->b_bn);

		  fa, bp->b_ops->name, bp->b_bn);



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

fs/xfs/xfs_error.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ extern void xfs_corruption_error(const char *tag, int level, 
			struct xfs_mount *mp, const void *buf, size_t bufsize,

			const char *filename, int linenum,

			xfs_failaddr_t failaddr);

void xfs_buf_corruption_error(struct xfs_buf *bp);

void xfs_buf_corruption_error(struct xfs_buf *bp, xfs_failaddr_t fa);

extern void xfs_buf_verifier_error(struct xfs_buf *bp, int error,

			const char *name, const void *buf, size_t bufsz,

			xfs_failaddr_t failaddr);