Commit 3f89243c authored by Eric Sandeen's avatar Eric Sandeen Committed by Tim Shimmin
Browse files

[XFS] Remove several macros that are no longer used anywhere 



SGI-PV: 955302
SGI-Modid: xfs-linux-melb:xfs-kern:26749a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 065d312e

fs/xfs/linux-2.6/xfs_buf.h

+0 −2
Original line number Diff line number Diff line
@@ -388,8 +388,6 @@ static inline int XFS_bwrite(xfs_buf_t *bp) 
	return error;

}



#define XFS_bdwrite(bp)		xfs_buf_iostart(bp, XBF_DELWRI | XBF_ASYNC)



static inline int xfs_bdwrite(void *mp, xfs_buf_t *bp)

{

	bp->b_strat = xfs_bdstrat_cb;

fs/xfs/linux-2.6/xfs_linux.h

+0 −7
Original line number Diff line number Diff line
@@ -148,11 +148,7 @@ BUFFER_FNS(PrivateStart, unwritten); 
		(current->flags = ((current->flags & ~(f)) | (*(sp) & (f))))



#define NBPP		PAGE_SIZE

#define DPPSHFT		(PAGE_SHIFT - 9)

#define NDPP		(1 << (PAGE_SHIFT - 9))

#define dtop(DD)	(((DD) + NDPP - 1) >> DPPSHFT)

#define dtopt(DD)	((DD) >> DPPSHFT)

#define dpoff(DD)	((DD) & (NDPP-1))



#define NBBY		8		/* number of bits per byte */

#define	NBPC		PAGE_SIZE	/* Number of bytes per click */
@@ -172,8 +168,6 @@ BUFFER_FNS(PrivateStart, unwritten); 
#define	btoct(x)	((__psunsigned_t)(x)>>BPCSHIFT)

#define	btoc64(x)	(((__uint64_t)(x)+(NBPC-1))>>BPCSHIFT)

#define	btoct64(x)	((__uint64_t)(x)>>BPCSHIFT)

#define	io_btoc(x)	(((__psunsigned_t)(x)+(IO_NBPC-1))>>IO_BPCSHIFT)

#define	io_btoct(x)	((__psunsigned_t)(x)>>IO_BPCSHIFT)



/* off_t bytes to clicks */

#define offtoc(x)       (((__uint64_t)(x)+(NBPC-1))>>BPCSHIFT)
@@ -186,7 +180,6 @@ BUFFER_FNS(PrivateStart, unwritten); 
#define	ctob(x)		((__psunsigned_t)(x)<<BPCSHIFT)

#define btoct(x)        ((__psunsigned_t)(x)>>BPCSHIFT)

#define	ctob64(x)	((__uint64_t)(x)<<BPCSHIFT)

#define	io_ctob(x)	((__psunsigned_t)(x)<<IO_BPCSHIFT)



/* bytes to clicks */

#define btoc(x)         (((__psunsigned_t)(x)+(NBPC-1))>>BPCSHIFT)

fs/xfs/quota/xfs_qm.h

+0 −6
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ extern kmem_zone_t *qm_dqtrxzone; 
#define XFS_QM_HASHSIZE_LOW		(NBPP / sizeof(xfs_dqhash_t))

#define XFS_QM_HASHSIZE_HIGH		((NBPP * 4) / sizeof(xfs_dqhash_t))



/*

 * We output a cmn_err when quotachecking a quota file with more than

 * this many fsbs.

 */

#define XFS_QM_BIG_QCHECK_NBLKS		500



/*

 * This defines the unit of allocation of dquots.

 * Currently, it is just one file system block, and a 4K blk contains 30

fs/xfs/quota/xfs_quota_priv.h

+0 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static inline int XQMISLCKD(struct xfs_dqhash *h) 


#define xfs_qm_freelist_lock(qm)	XQMLCK(&((qm)->qm_dqfreelist))

#define xfs_qm_freelist_unlock(qm)	XQMUNLCK(&((qm)->qm_dqfreelist))

#define XFS_QM_IS_FREELIST_LOCKED(qm)	XQMISLCKD(&((qm)->qm_dqfreelist))



/*

 * Hash into a bucket in the dquot hash table, based on <mp, id>.
@@ -170,6 +169,5 @@ for ((dqp) = (qlist)->qh_next; (dqp) != (xfs_dquot_t *)(qlist); \ 
#define DQFLAGTO_TYPESTR(d)	(((d)->dq_flags & XFS_DQ_USER) ? "USR" : \

				 (((d)->dq_flags & XFS_DQ_GROUP) ? "GRP" : \

				 (((d)->dq_flags & XFS_DQ_PROJ) ? "PRJ":"???")))

#define DQFLAGTO_DIRTYSTR(d)	(XFS_DQ_IS_DIRTY(d) ? "DIRTY" : "NOTDIRTY")



#endif	/* __XFS_QUOTA_PRIV_H__ */

fs/xfs/xfs_error.h

+0 −8
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ 
#ifndef	__XFS_ERROR_H__

#define	__XFS_ERROR_H__



#define XFS_ERECOVER	1	/* Failure to recover log */

#define XFS_ELOGSTAT	2	/* Failure to stat log in user space */

#define XFS_ENOLOGSPACE	3	/* Reservation too large */

#define XFS_ENOTSUP	4	/* Operation not supported */

#define	XFS_ENOLSN	5	/* Can't find the lsn you asked for */

#define XFS_ENOTFOUND	6

#define XFS_ENOTXFS	7	/* Not XFS filesystem */



#ifdef DEBUG

#define	XFS_ERROR_NTRAP	10

extern int	xfs_etrap[XFS_ERROR_NTRAP];