Commit e2705b03 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: remove xfs_inobp_check() 



This debug code is called on every xfs_iflush() call, which then
checks every inode in the buffer for non-zero unlinked list field.
Hence it checks every inode in the cluster buffer every time a
single inode on that cluster it flushed. This is resulting in:

-   38.91%     5.33%  [kernel]  [k] xfs_iflush
   - 17.70% xfs_iflush
      - 9.93% xfs_inobp_check
           4.36% xfs_buf_offset

10% of the CPU time spent flushing inodes is repeatedly checking
unlinked fields in the buffer. We don't need to do this.

The other place we call xfs_inobp_check() is
xfs_iunlink_update_dinode(), and this is after we've done this
assert for the agino we are about to write into that inode:

	ASSERT(xfs_verify_agino_or_null(mp, agno, next_agino));

which means we've already checked that the agino we are about to
write is not 0 on debug kernels. The inode buffer verifiers do
everything else we need, so let's just remove this debug code.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent a69a1dc2

fs/xfs/libxfs/xfs_inode_buf.c

+0 −24
Original line number Diff line number Diff line
@@ -20,30 +20,6 @@ 


#include <linux/iversion.h>



/*

 * Check that none of the inode's in the buffer have a next

 * unlinked field of 0.

 */

#if defined(DEBUG)

void

xfs_inobp_check(

	xfs_mount_t	*mp,

	xfs_buf_t	*bp)

{

	int		i;

	xfs_dinode_t	*dip;



	for (i = 0; i < M_IGEO(mp)->inodes_per_cluster; i++) {

		dip = xfs_buf_offset(bp, i * mp->m_sb.sb_inodesize);

		if (!dip->di_next_unlinked)  {

			xfs_alert(mp,

	"Detected bogus zero next_unlinked field in inode %d buffer 0x%llx.",

				i, (long long)bp->b_bn);

		}

	}

}

#endif



/*

 * If we are doing readahead on an inode buffer, we might be in log recovery

 * reading an inode allocation buffer that hasn't yet been replayed, and hence

fs/xfs/libxfs/xfs_inode_buf.h

+0 −6
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ int xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from); 
void	xfs_log_dinode_to_disk(struct xfs_log_dinode *from,

			       struct xfs_dinode *to);



#if defined(DEBUG)

void	xfs_inobp_check(struct xfs_mount *, struct xfs_buf *);

#else

#define	xfs_inobp_check(mp, bp)

#endif /* DEBUG */



xfs_failaddr_t xfs_dinode_verify(struct xfs_mount *mp, xfs_ino_t ino,

			   struct xfs_dinode *dip);

xfs_failaddr_t xfs_inode_validate_extsize(struct xfs_mount *mp,

fs/xfs/xfs_inode.c

+0 −2
Original line number Diff line number Diff line
@@ -2165,7 +2165,6 @@ xfs_iunlink_update_dinode( 
	xfs_dinode_calc_crc(mp, dip);

	xfs_trans_inode_buf(tp, ibp);

	xfs_trans_log_buf(tp, ibp, offset, offset + sizeof(xfs_agino_t) - 1);

	xfs_inobp_check(mp, ibp);

}



/* Set an in-core inode's unlinked pointer and return the old value. */
@@ -3558,7 +3557,6 @@ xfs_iflush( 
	xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK);

	if (XFS_IFORK_Q(ip))

		xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK);

	xfs_inobp_check(mp, bp);



	/*

	 * We've recorded everything logged in the inode, so we'd like to clear