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

Commit 7e56d9ea authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove xfs_buf parameter from inode scrub methods 



Now that we no longer do raw inode buffer scrubbing, the bp parameter is
no longer used anywhere we're dealing with an inode, so remove it and
all the useless NULL parameters that go with it.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent d0018ad8

fs/xfs/scrub/attr.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ xfs_scrub_xattr_listent( 


	if (flags & XFS_ATTR_INCOMPLETE) {

		/* Incomplete attr key, just mark the inode for preening. */

		xfs_scrub_ino_set_preen(sx->sc, context->dp->i_ino, NULL);

		xfs_scrub_ino_set_preen(sx->sc, context->dp->i_ino);

		return;

	}

fs/xfs/scrub/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ xfs_scrub_bmap( 
			goto out;

		/* No CoW forks on non-reflink inodes/filesystems. */

		if (!xfs_is_reflink_inode(ip)) {

			xfs_scrub_ino_set_corrupt(sc, sc->ip->i_ino, NULL);

			xfs_scrub_ino_set_corrupt(sc, sc->ip->i_ino);

			goto out;

		}

		break;
@@ -630,7 +630,7 @@ xfs_scrub_bmap( 
			goto out_check_rmap;

		if (!xfs_sb_version_hasattr(&mp->m_sb) &&

		    !xfs_sb_version_hasattr2(&mp->m_sb))

			xfs_scrub_ino_set_corrupt(sc, sc->ip->i_ino, NULL);

			xfs_scrub_ino_set_corrupt(sc, sc->ip->i_ino);

		break;

	default:

		ASSERT(whichfork == XFS_DATA_FORK);

fs/xfs/scrub/common.c

+8 −14
Original line number Diff line number Diff line
@@ -213,12 +213,10 @@ xfs_scrub_block_set_preen( 
void

xfs_scrub_ino_set_preen(

	struct xfs_scrub_context	*sc,

	xfs_ino_t			ino,

	struct xfs_buf			*bp)

	xfs_ino_t			ino)

{

	sc->sm->sm_flags |= XFS_SCRUB_OFLAG_PREEN;

	trace_xfs_scrub_ino_preen(sc, ino, bp ? bp->b_bn : 0,

			__return_address);

	trace_xfs_scrub_ino_preen(sc, ino, __return_address);

}



/* Record a corrupt block. */
@@ -249,22 +247,20 @@ xfs_scrub_block_xref_set_corrupt( 
void

xfs_scrub_ino_set_corrupt(

	struct xfs_scrub_context	*sc,

	xfs_ino_t			ino,

	struct xfs_buf			*bp)

	xfs_ino_t			ino)

{

	sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT;

	trace_xfs_scrub_ino_error(sc, ino, bp ? bp->b_bn : 0, __return_address);

	trace_xfs_scrub_ino_error(sc, ino, __return_address);

}



/* Record a corruption while cross-referencing with an inode. */

void

xfs_scrub_ino_xref_set_corrupt(

	struct xfs_scrub_context	*sc,

	xfs_ino_t			ino,

	struct xfs_buf			*bp)

	xfs_ino_t			ino)

{

	sc->sm->sm_flags |= XFS_SCRUB_OFLAG_XCORRUPT;

	trace_xfs_scrub_ino_error(sc, ino, bp ? bp->b_bn : 0, __return_address);

	trace_xfs_scrub_ino_error(sc, ino, __return_address);

}



/* Record corruption in a block indexed by a file fork. */
@@ -296,12 +292,10 @@ xfs_scrub_fblock_xref_set_corrupt( 
void

xfs_scrub_ino_set_warning(

	struct xfs_scrub_context	*sc,

	xfs_ino_t			ino,

	struct xfs_buf			*bp)

	xfs_ino_t			ino)

{

	sc->sm->sm_flags |= XFS_SCRUB_OFLAG_WARNING;

	trace_xfs_scrub_ino_warning(sc, ino, bp ? bp->b_bn : 0,

			__return_address);

	trace_xfs_scrub_ino_warning(sc, ino, __return_address);

}



/* Warn about a block indexed by a file fork that needs review. */

fs/xfs/scrub/common.h

+5 −8
Original line number Diff line number Diff line
@@ -63,25 +63,22 @@ bool xfs_scrub_fblock_xref_process_error(struct xfs_scrub_context *sc, 


void xfs_scrub_block_set_preen(struct xfs_scrub_context *sc,

		struct xfs_buf *bp);

void xfs_scrub_ino_set_preen(struct xfs_scrub_context *sc, xfs_ino_t ino,

		struct xfs_buf *bp);

void xfs_scrub_ino_set_preen(struct xfs_scrub_context *sc, xfs_ino_t ino);



void xfs_scrub_block_set_corrupt(struct xfs_scrub_context *sc,

		struct xfs_buf *bp);

void xfs_scrub_ino_set_corrupt(struct xfs_scrub_context *sc, xfs_ino_t ino,

		struct xfs_buf *bp);

void xfs_scrub_ino_set_corrupt(struct xfs_scrub_context *sc, xfs_ino_t ino);

void xfs_scrub_fblock_set_corrupt(struct xfs_scrub_context *sc, int whichfork,

		xfs_fileoff_t offset);



void xfs_scrub_block_xref_set_corrupt(struct xfs_scrub_context *sc,

		struct xfs_buf *bp);

void xfs_scrub_ino_xref_set_corrupt(struct xfs_scrub_context *sc, xfs_ino_t ino,

		struct xfs_buf *bp);

void xfs_scrub_ino_xref_set_corrupt(struct xfs_scrub_context *sc,

		xfs_ino_t ino);

void xfs_scrub_fblock_xref_set_corrupt(struct xfs_scrub_context *sc,

		int whichfork, xfs_fileoff_t offset);



void xfs_scrub_ino_set_warning(struct xfs_scrub_context *sc, xfs_ino_t ino,

		struct xfs_buf *bp);

void xfs_scrub_ino_set_warning(struct xfs_scrub_context *sc, xfs_ino_t ino);

void xfs_scrub_fblock_set_warning(struct xfs_scrub_context *sc, int whichfork,

		xfs_fileoff_t offset);

fs/xfs/scrub/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ xfs_scrub_directory( 


	/* Plausible size? */

	if (sc->ip->i_d.di_size < xfs_dir2_sf_hdr_size(0)) {

		xfs_scrub_ino_set_corrupt(sc, sc->ip->i_ino, NULL);

		xfs_scrub_ino_set_corrupt(sc, sc->ip->i_ino);

		goto out;

	}