Commit 16c9de54 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: fix deadlock retry tracepoint arguments 



sc->ip is the inode that's being scrubbed, which means that it's not set
for scrub types that don't involve inodes.  If one of those scrubbers
(e.g. inode btrees) returns EDEADLOCK, we'll trip over the null pointer.
Fix that by reporting either the file being examined or the file that
was used to call scrub.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 676a659b

fs/xfs/scrub/common.c

+3 −1
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ __xchk_process_error( 
		return true;

	case -EDEADLOCK:

		/* Used to restart an op with deadlock avoidance. */

		trace_xchk_deadlock_retry(sc->ip, sc->sm, *error);

		trace_xchk_deadlock_retry(

				sc->ip ? sc->ip : XFS_I(file_inode(sc->file)),

				sc->sm, *error);

		break;

	case -EFSBADCRC:

	case -EFSCORRUPTED: