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

Commit 9c48876a authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Remove dead code from come bulkstat paths. 



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

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

fs/xfs/quota/xfs_qm.c

+1 −3
Original line number Diff line number Diff line
@@ -1905,9 +1905,7 @@ xfs_qm_quotacheck( 
		 */

		if ((error = xfs_bulkstat(mp, &lastino, &count,

				     xfs_qm_dqusage_adjust, NULL,

				     structsz, NULL,

				     BULKSTAT_FG_IGET|BULKSTAT_FG_VFSLOCKED,

				     &done)))

				     structsz, NULL, BULKSTAT_FG_IGET, &done)))

			break;



	} while (! done);

fs/xfs/xfs_itable.c

+0 −16
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ 
#include "xfs_error.h"

#include "xfs_btree.h"



#ifndef HAVE_USERACC

#define useracc(ubuffer, size, flags, foo) (0)

#define unuseracc(ubuffer, size, flags)

#endif



STATIC int

xfs_bulkstat_one_iget(

	xfs_mount_t	*mp,		/* mount point for filesystem */
@@ -335,15 +330,6 @@ xfs_bulkstat( 
		(XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog);

	nimask = ~(nicluster - 1);

	nbcluster = nicluster >> mp->m_sb.sb_inopblog;

	/*

	 * Lock down the user's buffer. If a buffer was not sent, as in the case

	 * disk quota code calls here, we skip this.

	 */

	if (ubuffer &&

	    (error = useracc(ubuffer, ubcount * statstruct_size,

			(B_READ|B_PHYS), NULL))) {

		return error;

	}

	/*

	 * Allocate a page-sized buffer for inode btree records.

	 * We could try allocating something smaller, but for normal
@@ -650,8 +636,6 @@ xfs_bulkstat( 
	 * Done, we're either out of filesystem or space to put the data.

	 */

	kmem_free(irbuf, NBPC);

	if (ubuffer)

		unuseracc(ubuffer, ubcount * statstruct_size, (B_READ|B_PHYS));

	*ubcountp = ubelem;

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

		/*

fs/xfs/xfs_itable.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ typedef int (*bulkstat_one_pf)(struct xfs_mount *mp, 
 */

#define	BULKSTAT_FG_IGET	0x1	/* Go through the buffer cache */

#define	BULKSTAT_FG_QUICK	0x2	/* No iget, walk the dinode cluster */

#define BULKSTAT_FG_VFSLOCKED	0x4	/* Already have vfs lock */



/*

 * Return stat information in bulk (by-inode) for the filesystem.