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

Commit 46039928 authored by Barry Naujok's avatar Barry Naujok Committed by Lachlan McIlroy
Browse files

[XFS] Remove final remnants of dirv1 macros and other stuff 



SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:32002a

Signed-off-by: default avatarBarry Naujok <bnaujok@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent d07c60e5

fs/xfs/xfs_da_btree.h

+0 −20
Original line number Diff line number Diff line
@@ -72,27 +72,7 @@ typedef struct xfs_da_intnode { 
typedef struct xfs_da_node_hdr xfs_da_node_hdr_t;

typedef struct xfs_da_node_entry xfs_da_node_entry_t;



#define XFS_DA_MAXHASH	((xfs_dahash_t)-1) /* largest valid hash value */



#define	XFS_LBSIZE(mp)	(mp)->m_sb.sb_blocksize

#define	XFS_LBLOG(mp)	(mp)->m_sb.sb_blocklog



#define	XFS_DA_MAKE_BNOENTRY(mp,bno,entry)	\

	(((bno) << (mp)->m_dircook_elog) | (entry))

#define	XFS_DA_MAKE_COOKIE(mp,bno,entry,hash)	\

	(((xfs_off_t)XFS_DA_MAKE_BNOENTRY(mp, bno, entry) << 32) | (hash))

#define	XFS_DA_COOKIE_HASH(mp,cookie)		((xfs_dahash_t)cookie)

#define	XFS_DA_COOKIE_BNO(mp,cookie)		\

	((((xfs_off_t)(cookie) >> 31) == -1LL ? \

		(xfs_dablk_t)0 : \

		(xfs_dablk_t)((xfs_off_t)(cookie) >> \

				((mp)->m_dircook_elog + 32))))

#define	XFS_DA_COOKIE_ENTRY(mp,cookie)		\

	((((xfs_off_t)(cookie) >> 31) == -1LL ?	\

		(xfs_dablk_t)0 : \

		(xfs_dablk_t)(((xfs_off_t)(cookie) >> 32) & \

				((1 << (mp)->m_dircook_elog) - 1))))





/*========================================================================

 * Btree searching and modification structure definitions.

fs/xfs/xfs_mount.h

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ typedef struct xfs_mount { 
	xfs_buftarg_t		*m_ddev_targp;	/* saves taking the address */

	xfs_buftarg_t		*m_logdev_targp;/* ptr to log device */

	xfs_buftarg_t		*m_rtdev_targp;	/* ptr to rt device */

	__uint8_t		m_dircook_elog;	/* log d-cookie entry bits */

	__uint8_t		m_blkbit_log;	/* blocklog + NBBY */

	__uint8_t		m_blkbb_log;	/* blocklog - BBSHIFT */

	__uint8_t		m_agno_log;	/* log #ag's */