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

Commit 4d1a2ed3 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Fix up debug code so that bulkstat wont generate thousands of 


fsstress warnings.

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:26111a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent a916e2bd

fs/xfs/xfs_ialloc.c

+3 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,9 @@ xfs_dilocate( 
	if (agno >= mp->m_sb.sb_agcount || agbno >= mp->m_sb.sb_agblocks ||

	    ino != XFS_AGINO_TO_INO(mp, agno, agino)) {

#ifdef DEBUG

		/* no diagnostics for bulkstat, ino comes from userspace */

		if (flags & XFS_IMAP_BULKSTAT)

			return XFS_ERROR(EINVAL);

		if (agno >= mp->m_sb.sb_agcount) {

			xfs_fs_cmn_err(CE_ALERT, mp,

					"xfs_dilocate: agno (%d) >= "

fs/xfs/xfs_inode.c

+12 −10
Original line number Diff line number Diff line
@@ -256,13 +256,11 @@ xfs_itobp( 
	xfs_daddr_t	bno,

	uint		imap_flags)

{

	xfs_imap_t	imap;

	xfs_buf_t	*bp;

	int		error;

	xfs_imap_t	imap;

#ifdef __KERNEL__

	int		i;

	int		ni;

#endif



	if (ip->i_blkno == (xfs_daddr_t)0) {

		/*
@@ -319,7 +317,6 @@ xfs_itobp( 
	 */

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, imap.im_blkno,

				   (int)imap.im_len, XFS_BUF_LOCK, &bp);



	if (error) {

#ifdef DEBUG

		xfs_fs_cmn_err(CE_ALERT, mp, "xfs_itobp: "
@@ -330,17 +327,21 @@ xfs_itobp( 
#endif /* DEBUG */

		return error;

	}

#ifdef __KERNEL__



	/*

	 * Validate the magic number and version of every inode in the buffer

	 * (if DEBUG kernel) or the first inode in the buffer, otherwise.

	 * No validation is done here in userspace (xfs_repair).

	 */

#ifdef DEBUG

#if !defined(__KERNEL__)

	ni = 0;

#elif defined(DEBUG)

	ni = (imap_flags & XFS_IMAP_BULKSTAT) ? 0 :

		(BBTOB(imap.im_len) >> mp->m_sb.sb_inodelog);

#else

#else	/* usual case */

	ni = (imap_flags & XFS_IMAP_BULKSTAT) ? 0 : 1;

#endif



	for (i = 0; i < ni; i++) {

		int		di_ok;

		xfs_dinode_t	*dip;
@@ -352,7 +353,9 @@ xfs_itobp( 
		if (unlikely(XFS_TEST_ERROR(!di_ok, mp, XFS_ERRTAG_ITOBP_INOTOBP,

				 XFS_RANDOM_ITOBP_INOTOBP))) {

#ifdef DEBUG

			cmn_err(CE_ALERT, "Device %s - bad inode magic/vsn "

			if (!(imap_flags & XFS_IMAP_BULKSTAT))

				cmn_err(CE_ALERT,

					"Device %s - bad inode magic/vsn "

					"daddr %lld #%d (magic=%x)",

				XFS_BUFTARG_NAME(mp->m_ddev_targp),

				(unsigned long long)imap.im_blkno, i,
@@ -364,7 +367,6 @@ xfs_itobp( 
			return XFS_ERROR(EFSCORRUPTED);

		}

	}

#endif	/* __KERNEL__ */



	xfs_inobp_check(mp, bp);