xfs: remove the xfs_dqblk_t typedef

Remove the few leftover instances of the xfs_dinode_t typedef.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c
index deeb74becabc72845b9802ce120b4e295ea86034..15a362e2f5ea70593fe3f3f050be5e06e671741b 100644 (file)
--- a/fs/xfs/libxfs/xfs_dquot_buf.c
+++ b/fs/xfs/libxfs/xfs_dquot_buf.c
@@ -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;

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 10f38541f3139c264203d191cbfcbeb8dc090d64..d665c04e69dd3fa981b414f6687703d0566e78c4 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -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)
 

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index c15d61d47a06608b2398019d4d44adb2f291a104..c9e1f2c94bd4fcc44e58598bf11bd30c77717fde 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -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

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 5608066d6e5398f83a2689e81b0a2a5004b6b05b..32ac8d9c8940b8bd0227ff5251485ebd46f64cc4 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -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;