Commit 11a83f4c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the xfs_dqblk_t typedef 



Remove the few leftover instances of the xfs_dinode_t typedef.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent ed67ebfd

fs/xfs/libxfs/xfs_dquot_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ xfs_calc_dquots_per_chunk( 
	unsigned int		nbblks)	/* basic block units */

{

	ASSERT(nbblks > 0);

	return BBTOB(nbblks) / sizeof(xfs_dqblk_t);

	return BBTOB(nbblks) / sizeof(struct xfs_dqblk);

}



/*
@@ -127,7 +127,7 @@ xfs_dqblk_repair( 
	 * Typically, a repair is only requested by quotacheck.

	 */

	ASSERT(id != -1);

	memset(dqb, 0, sizeof(xfs_dqblk_t));

	memset(dqb, 0, sizeof(struct xfs_dqblk));



	dqb->dd_diskdq.d_magic = cpu_to_be16(XFS_DQUOT_MAGIC);

	dqb->dd_diskdq.d_version = XFS_DQUOT_VERSION;

fs/xfs/libxfs/xfs_format.h

+2 −2
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ struct xfs_disk_dquot { 
 * This is what goes on disk. This is separated from the xfs_disk_dquot because

 * carrying the unnecessary padding would be a waste of memory.

 */

typedef struct xfs_dqblk {

struct xfs_dqblk {

	struct xfs_disk_dquot	dd_diskdq; /* portion living incore as well */

	char			dd_fill[4];/* filling for posterity */
@@ -1225,7 +1225,7 @@ typedef struct xfs_dqblk { 
	__be32		  dd_crc;	/* checksum */

	__be64		  dd_lsn;	/* last modification in log */

	uuid_t		  dd_uuid;	/* location information */

} xfs_dqblk_t;

};



#define XFS_DQUOT_CRC_OFF	offsetof(struct xfs_dqblk, dd_crc)

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ xfs_dquot_alloc( 
	 * Offset of dquot in the (fixed sized) dquot chunk.

	 */

	dqp->q_bufoffset = (id % mp->m_quotainfo->qi_dqperchunk) *

			sizeof(xfs_dqblk_t);

			sizeof(struct xfs_dqblk);



	/*

	 * Because we want to use a counting completion, complete

fs/xfs/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ xfs_qm_reset_dqcounts( 
	 */

#ifdef DEBUG

	j = (int)XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) /

		sizeof(xfs_dqblk_t);

		sizeof(struct xfs_dqblk);

	ASSERT(mp->m_quotainfo->qi_dqperchunk == j);

#endif

	dqb = bp->b_addr;