iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: remove the xfs_dqblk_t typedef

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2021-10-11 16:12:37 -07:00 committed by Darrick J. Wong
parent ed67ebfd7c
commit 11a83f4c39
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/libxfs/xfs_dquot_buf.c
View File

@ -22,7 +22,7 @@ xfs_calc_dquots_per_chunk(
unsigned int nbblks) /* basic block units */ unsigned int nbblks) /* basic block units */
{ {
ASSERT(nbblks > 0); 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. * Typically, a repair is only requested by quotacheck.
*/ */
ASSERT(id != -1); 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_magic = cpu_to_be16(XFS_DQUOT_MAGIC);
dqb->dd_diskdq.d_version = XFS_DQUOT_VERSION; dqb->dd_diskdq.d_version = XFS_DQUOT_VERSION;

4
fs/xfs/libxfs/xfs_format.h
View File

@ -1215,7 +1215,7 @@ struct xfs_disk_dquot {
* This is what goes on disk. This is separated from the xfs_disk_dquot because * 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. * 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 */ struct xfs_disk_dquot dd_diskdq; /* portion living incore as well */
char dd_fill[4];/* filling for posterity */ char dd_fill[4];/* filling for posterity */
@ -1225,7 +1225,7 @@ typedef struct xfs_dqblk {
__be32 dd_crc; /* checksum */ __be32 dd_crc; /* checksum */
__be64 dd_lsn; /* last modification in log */ __be64 dd_lsn; /* last modification in log */
uuid_t dd_uuid; /* location information */ uuid_t dd_uuid; /* location information */
} xfs_dqblk_t; };
#define XFS_DQUOT_CRC_OFF offsetof(struct xfs_dqblk, dd_crc) #define XFS_DQUOT_CRC_OFF offsetof(struct xfs_dqblk, dd_crc)

2
fs/xfs/xfs_dquot.c
View File

@ -471,7 +471,7 @@ xfs_dquot_alloc(
* Offset of dquot in the (fixed sized) dquot chunk. * Offset of dquot in the (fixed sized) dquot chunk.
*/ */
dqp->q_bufoffset = (id % mp->m_quotainfo->qi_dqperchunk) * 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 * Because we want to use a counting completion, complete

2
fs/xfs/xfs_qm.c
View File

@ -850,7 +850,7 @@ xfs_qm_reset_dqcounts(
*/ */
#ifdef DEBUG #ifdef DEBUG
j = (int)XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) / 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); ASSERT(mp->m_quotainfo->qi_dqperchunk == j);
#endif #endif
dqb = bp->b_addr; dqb = bp->b_addr;