From 0a1e1567b386b96c710d385181330c13ca03ffe3 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 6 Nov 2017 11:46:15 -0800 Subject: xfs: pass inode number to xfs_scrub_ino_set_{preen,warning} There are two ways to scrub an inode -- calling xfs_iget and checking the raw inode core, or by loading the inode cluster buffer and checking the on-disk contents directly. The second method is only useful if _iget fails the verifiers; when this is the case, sc->ip is NULL and calling the tracepoint will cause a system crash. Therefore, pass the raw inode number directly into the _preen and _warning functions. Reported-by: Dan Carpenter Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/scrub/common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'fs/xfs/scrub/common.c') diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index 318dd97c70b5..ac95fe911d96 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -165,10 +165,11 @@ xfs_scrub_block_set_preen( void xfs_scrub_ino_set_preen( struct xfs_scrub_context *sc, + xfs_ino_t ino, struct xfs_buf *bp) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_PREEN; - trace_xfs_scrub_ino_preen(sc, sc->ip->i_ino, bp ? bp->b_bn : 0, + trace_xfs_scrub_ino_preen(sc, ino, bp ? bp->b_bn : 0, __return_address); } @@ -215,10 +216,11 @@ xfs_scrub_fblock_set_corrupt( void xfs_scrub_ino_set_warning( struct xfs_scrub_context *sc, + xfs_ino_t ino, struct xfs_buf *bp) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_WARNING; - trace_xfs_scrub_ino_warning(sc, sc->ip->i_ino, bp ? bp->b_bn : 0, + trace_xfs_scrub_ino_warning(sc, ino, bp ? bp->b_bn : 0, __return_address); } -- cgit v1.2.3-59-g8ed1b