OSDN Git Service

xfs: fix deadlock retry tracepoint arguments
authorDarrick J. Wong <djwong@kernel.org>
Wed, 12 May 2021 23:41:13 +0000 (16:41 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Thu, 20 May 2021 15:31:22 +0000 (08:31 -0700)
commit16c9de54dc868c121918f2ae91e46330f919049f
tree643f1734146d65f904cf57797bfe27ea9f1b8937
parent676a659b60afb13166371580f3f6f434e9ba6f21
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: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Brian Foster <bfoster@redhat.com>
fs/xfs/scrub/common.c