Commit 4372d6e1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nathan Scott
Browse files

[XFS] Remove dead code. Patch from Adrian Bunk 



SGI-PV: 936255
SGI-Modid: xfs-linux:xfs-kern:192759a

Signed-off-by: default avatarChristoph Hellwig <hch@sgi.com>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent cf9937c6

fs/xfs/quota/xfs_dquot.c

+0 −62
Original line number Diff line number Diff line
@@ -370,68 +370,6 @@ xfs_qm_adjust_dqtimers( 
	}

}



/*

 * Increment or reset warnings of a given dquot.

 */

int

xfs_qm_dqwarn(

	xfs_disk_dquot_t	*d,

	uint			flags)

{

	int	warned;



	/*

	 * root's limits are not real limits.

	 */

	if (!d->d_id)

		return (0);



	warned = 0;

	if (INT_GET(d->d_blk_softlimit, ARCH_CONVERT) &&

	    (INT_GET(d->d_bcount, ARCH_CONVERT) >=

	     INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) {

		if (flags & XFS_QMOPT_DOWARN) {

			INT_MOD(d->d_bwarns, ARCH_CONVERT, +1);

			warned++;

		}

	} else {

		if (!d->d_blk_softlimit ||

		    (INT_GET(d->d_bcount, ARCH_CONVERT) <

		     INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) {

			d->d_bwarns = 0;

		}

	}



	if (INT_GET(d->d_ino_softlimit, ARCH_CONVERT) > 0 &&

	    (INT_GET(d->d_icount, ARCH_CONVERT) >=

	     INT_GET(d->d_ino_softlimit, ARCH_CONVERT))) {

		if (flags & XFS_QMOPT_DOWARN) {

			INT_MOD(d->d_iwarns, ARCH_CONVERT, +1);

			warned++;

		}

	} else {

		if (!d->d_ino_softlimit ||

		    (INT_GET(d->d_icount, ARCH_CONVERT) <

		     INT_GET(d->d_ino_softlimit, ARCH_CONVERT))) {

			d->d_iwarns = 0;

		}

	}

#ifdef QUOTADEBUG

	if (INT_GET(d->d_iwarns, ARCH_CONVERT))

		cmn_err(CE_DEBUG,

			"--------@@Inode warnings running : %Lu >= %Lu",

			INT_GET(d->d_icount, ARCH_CONVERT),

			INT_GET(d->d_ino_softlimit, ARCH_CONVERT));

	if (INT_GET(d->d_bwarns, ARCH_CONVERT))

		cmn_err(CE_DEBUG,

			"--------@@Blks warnings running : %Lu >= %Lu",

			INT_GET(d->d_bcount, ARCH_CONVERT),

			INT_GET(d->d_blk_softlimit, ARCH_CONVERT));

#endif

	return (warned);

}





/*

 * initialize a buffer full of dquots and log the whole thing

 */

fs/xfs/quota/xfs_dquot.h

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ extern void xfs_qm_adjust_dqtimers(xfs_mount_t *, 
					xfs_disk_dquot_t *);

extern void		xfs_qm_adjust_dqlimits(xfs_mount_t *,

					xfs_disk_dquot_t *);

extern int		xfs_qm_dqwarn(xfs_disk_dquot_t *, uint);

extern int		xfs_qm_dqget(xfs_mount_t *, xfs_inode_t *,

					xfs_dqid_t, uint, uint, xfs_dquot_t **);

extern void		xfs_qm_dqput(xfs_dquot_t *);

fs/xfs/xfs_bmap_btree.c

+0 −14
Original line number Diff line number Diff line
@@ -2331,20 +2331,6 @@ xfs_bmbt_lookup_ge( 
	return xfs_bmbt_lookup(cur, XFS_LOOKUP_GE, stat);

}



int					/* error */

xfs_bmbt_lookup_le(

	xfs_btree_cur_t	*cur,

	xfs_fileoff_t	off,

	xfs_fsblock_t	bno,

	xfs_filblks_t	len,

	int		*stat)		/* success/failure */

{

	cur->bc_rec.b.br_startoff = off;

	cur->bc_rec.b.br_startblock = bno;

	cur->bc_rec.b.br_blockcount = len;

	return xfs_bmbt_lookup(cur, XFS_LOOKUP_LE, stat);

}



/*

 * Give the bmap btree a new root block.  Copy the old broot contents

 * down into a real block and make the broot point to it.

fs/xfs/xfs_bmap_btree.h

+0 −8
Original line number Diff line number Diff line
@@ -580,14 +580,6 @@ xfs_bmbt_lookup_ge( 
	xfs_filblks_t,

	int *);



int

xfs_bmbt_lookup_le(

	struct xfs_btree_cur *,

	xfs_fileoff_t,

	xfs_fsblock_t,

	xfs_filblks_t,

	int *);



/*

 * Give the bmap btree a new root block.  Copy the old broot contents

 * down into a real block and make the broot point to it.

fs/xfs/xfs_fsops.c

+0 −26
Original line number Diff line number Diff line
@@ -559,32 +559,6 @@ xfs_reserve_blocks( 
	return(0);

}



void

xfs_fs_log_dummy(xfs_mount_t *mp)

{

	xfs_trans_t *tp;

	xfs_inode_t *ip;





	tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1);

	atomic_inc(&mp->m_active_trans);

	if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) {

		xfs_trans_cancel(tp, 0);

		return;

	}



	ip = mp->m_rootip;

	xfs_ilock(ip, XFS_ILOCK_EXCL);



	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

	xfs_trans_ihold(tp, ip);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

	xfs_trans_set_sync(tp);

	xfs_trans_commit(tp, 0, NULL);



	xfs_iunlock(ip, XFS_ILOCK_EXCL);

}



int

xfs_fs_goingdown(

	xfs_mount_t	*mp,