xfs: remove several typedefs in quota code
v2 cover xfs: remove several typedefs in quota code
Eliminate some typedefs.
Pavel Reichl (4):
xfs: remove the xfs_disk_dquot_t and xfs_dquot_t typedefs
xfs: remove the xfs_quotainfo_t typedef
xfs: remove the xfs_dq_logitem_t typedef
xfs: remove the xfs_qoff_logitem_t typedef
fs/xfs/libxfs/xfs_dquot_buf.c | 8 ++--- fs/xfs/libxfs/xfs_format.h | 10 +++---- fs/xfs/libxfs/xfs_trans_resv.c | 5 ++-- fs/xfs/xfs_dquot.c | 20 ++++++------- fs/xfs/xfs_dquot.h | 53 +++++++++++++++++----------------- fs/xfs/xfs_dquot_item.h | 18 +++++++----- fs/xfs/xfs_log_recover.c | 5 ++-- fs/xfs/xfs_qm.c | 48 +++++++++++++++--------------- fs/xfs/xfs_qm.h | 4 +-- fs/xfs/xfs_qm_bhv.c | 2 +- fs/xfs/xfs_qm_syscalls.c | 35 ++++++++++++---------- fs/xfs/xfs_trans_dquot.c | 52 ++++++++++++++++----------------- 12 files changed, 133 insertions(+), 127 deletions(-)
Signature · 1 line
2.23.0
PATCH v2 1/4 xfs: remove the xfs_disk_dquot_t and xfs_dquot_t typedefs
--- fs/xfs/libxfs/xfs_dquot_buf.c | 8 ++-- fs/xfs/libxfs/xfs_format.h | 10 ++--- fs/xfs/libxfs/xfs_trans_resv.c | 1 - fs/xfs/xfs_dquot.c | 18 ++++----- fs/xfs/xfs_dquot.h | 67 +++++++++++++++++----------------- fs/xfs/xfs_log_recover.c | 5 ++- fs/xfs/xfs_qm.c | 28 +++++++------- fs/xfs/xfs_qm_bhv.c | 2 +- fs/xfs/xfs_trans_dquot.c | 38 +++++++++---------- 9 files changed, 89 insertions(+), 88 deletions(-)
fs/xfs/libxfs/xfs_dquot_buf.c +4 -4
@@ -35,10 +35,10 @@ xfs_calc_dquots_per_chunk(xfs_failaddr_t xfs_dquot_verify ( -struct xfs_mount *mp, -xfs_disk_dquot_t *ddq, -xfs_dqid_t id, -uint type)/* used only during quotacheck */ +struct xfs_mount *mp, +struct xfs_disk_dquot *ddq, +xfs_dqid_t id, +uint type)/* used only during quotacheck */ {/* * We can encounter an uninitialized dquot buffer for 2 reasons:
fs/xfs/libxfs/xfs_format.h +5 -5
@@ -1144,11 +1144,11 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)/* * This is the main portion of the on-disk representation of quota -* information for a user. This is the q_core of the xfs_dquot_t that +* information for a user. This is the q_core of the struct xfs_dquot that * is kept in kernel memory. We pad this with some more expansion room * to construct the on disk structure. */ -typedef struct xfs_disk_dquot { +struct xfs_disk_dquot {__be16 d_magic;/* dquot magic = XFS_DQUOT_MAGIC */ __u8 d_version;/* dquot version */ __u8 d_flags;/* XFS_DQ_USER/PROJ/GROUP */
@@ -1171,15 +1171,15 @@ typedef struct xfs_disk_dquot {__be32 d_rtbtimer;/* similar to above; for RT disk blocks */ __be16 d_rtbwarns;/* warnings issued wrt RT disk blocks */ __be16 d_pad; -} xfs_disk_dquot_t; +};/* * 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 { - xfs_disk_dquot_t dd_diskdq; /* portion that lives incore as well */ - char dd_fill[4]; /* filling for posterity */ + struct xfs_disk_dquot dd_diskdq; /* portion living incore as well */ + char dd_fill[4];/* filling for posterity */ /* * These two are only present on filesystems with the CRC bits set.
fs/xfs/libxfs/xfs_trans_resv.c +0 -1
@@ -718,7 +718,6 @@ xfs_calc_clear_agi_bucket_reservation(/* * Adjusting quota limits. -* the xfs_disk_dquot_t: sizeof(struct xfs_disk_dquot) */ STATIC uintxfs_calc_qm_setqlim_reservation (void )
fs/xfs/xfs_dquot.c +9 -9
@@ -48,7 +48,7 @@ static struct lock_class_key xfs_dquot_project_class;*/ void xfs_qm_dqdestroy ( -xfs_dquot_t *dqp) +struct xfs_dquot *dqp) {ASSERT (list_empty (&dqp->q_lru));
@@ -113,8 +113,8 @@ xfs_qm_adjust_dqlimits(*/ void xfs_qm_adjust_dqtimers ( -xfs_mount_t *mp, -xfs_disk_dquot_t *d) +struct xfs_mount *mp, +struct xfs_disk_dquot *d) {ASSERT (d->d_id);
@@ -497,7 +497,7 @@ xfs_dquot_from_disk(struct xfs_disk_dquot *ddqp = bp->b_addr + dqp->q_bufoffset;/* copy everything from disk dquot to the incore dquot */ -memcpy (&dqp->q_core, ddqp,sizeof (xfs_disk_dquot_t)); +memcpy (&dqp->q_core, ddqp,sizeof (struct xfs_disk_dquot ));/* * Reservation counters are defined as reservation plus current usage
@@ -989,7 +989,7 @@ xfs_qm_dqput(*/ void xfs_qm_dqrele ( -xfs_dquot_t *dqp) +struct xfs_dquot *dqp) {if (!dqp)return ;
@@ -1019,7 +1019,7 @@ xfs_qm_dqflush_done( struct xfs_log_item *lip) {xfs_dq_logitem_t *qip = (struct xfs_dq_logitem *)lip; -xfs_dquot_t *dqp = qip->qli_dquot; +struct xfs_dquot *dqp = qip->qli_dquot;struct xfs_ail *ailp = lip->li_ailp;/*
@@ -1130,7 +1130,7 @@ xfs_qm_dqflush( }/* This is the only portion of data that needs to persist */ -memcpy (ddqp, &dqp->q_core,sizeof (xfs_disk_dquot_t)); +memcpy (ddqp, &dqp->q_core,sizeof (struct xfs_disk_dquot ));/* * Clear the dirty field and remember the flush lsn for later use.
@@ -1188,8 +1188,8 @@ xfs_qm_dqflush(*/ void xfs_dqlock2 ( -xfs_dquot_t *d1, -xfs_dquot_t *d2) +struct xfs_dquot *d1, +struct xfs_dquot *d2) {if (d1 && d2) {ASSERT (d1 != d2);
fs/xfs/xfs_dquot.h +34 -33
111 lines not on this page · raw message
fs/xfs/xfs_log_recover.c +3 -2
@@ -2576,6 +2576,7 @@ xlog_recover_do_reg_buffer(int bit;int nbits;xfs_failaddr_t fa; +const size_t size_disk_dquot =sizeof (struct xfs_disk_dquot );trace_xfs_log_recover_buf_reg_buf (mp->m_log, buf_f);
@@ -2618,7 +2619,7 @@ xlog_recover_do_reg_buffer( "XFS: NULL dquot in %s.", __func__); goto next; } -if (item->ri_buf[i].i_len <sizeof (xfs_disk_dquot_t)) { +if (item->ri_buf[i].i_len < size_disk_dquot) {xfs_alert (mp,"XFS: dquot too small (%d) in %s." , item->ri_buf[i].i_len, __func__);
@@ -3249,7 +3250,7 @@ xlog_recover_dquot_pass2(xfs_alert (log->l_mp,"NULL dquot in %s." , __func__);return -EIO ; } -if (item->ri_buf[1 ].i_len <sizeof (xfs_disk_dquot_t)) { +if (item->ri_buf[1 ].i_len <sizeof (struct xfs_disk_dquot )) {xfs_alert (log->l_mp,"dquot too small (%d) in %s." , item->ri_buf[1 ].i_len, __func__);return -EIO ;
fs/xfs/xfs_qm.c +14 -14
@@ -244,14 +244,14 @@ xfs_qm_unmount_quotas( STATIC intxfs_qm_dqattach_one ( -xfs_inode_t *ip, -xfs_dqid_t id, -uint type, -bool doalloc, -xfs_dquot_t **IO_idqpp) +xfs_inode_t *ip, +xfs_dqid_t id, +uint type, +bool doalloc, +struct xfs_dquot **IO_idqpp) { -xfs_dquot_t *dqp; -int error; +struct xfs_dquot *dqp; +int error;ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL )); error =0 ;
@@ -544,7 +544,7 @@ xfs_qm_set_defquota(uint type, xfs_quotainfo_t *qinf) { - xfs_dquot_t *dqp; + struct xfs_dquot *dqp;struct xfs_def_quota *defq;struct xfs_disk_dquot *ddqp;int error;
@@ -1746,14 +1746,14 @@ xfs_qm_vop_dqalloc(* Actually transfer ownership, and do dquot modifications. * These were already reserved. */ -xfs_dquot_t * +struct xfs_dquot *xfs_qm_vop_chown ( -xfs_trans_t *tp, -xfs_inode_t *ip, -xfs_dquot_t **IO_olddq, -xfs_dquot_t *newdq) +xfs_trans_t *tp, +xfs_inode_t *ip, +struct xfs_dquot **IO_olddq, +struct xfs_dquot *newdq) { -xfs_dquot_t *prevdq; +struct xfs_dquot *prevdq;uint bfield =XFS_IS_REALTIME_INODE (ip) ?XFS_TRANS_DQ_RTBCOUNT :XFS_TRANS_DQ_BCOUNT ;
fs/xfs/xfs_qm_bhv.c +1 -1
@@ -58,7 +58,7 @@ xfs_qm_statvfs( struct kstatfs *statp) {xfs_mount_t *mp = ip->i_mount; -xfs_dquot_t *dqp; +struct xfs_dquot *dqp;if (!xfs_qm_dqget (mp,xfs_get_projid (ip),XFS_DQ_PROJ , false, &dqp)) {xfs_fill_statvfs_from_dquot (statp, dqp);
fs/xfs/xfs_trans_dquot.c +19 -19
@@ -25,8 +25,8 @@ STATIC void xfs_trans_alloc_dqinfo(xfs_trans_t *);*/ void xfs_trans_dqjoin ( -xfs_trans_t *tp, -xfs_dquot_t *dqp) +xfs_trans_t *tp, +struct xfs_dquot *dqp) {ASSERT (XFS_DQ_IS_LOCKED (dqp));ASSERT (dqp->q_logitem.qli_dquot == dqp);
@@ -49,8 +49,8 @@ xfs_trans_dqjoin(*/ void xfs_trans_log_dquot ( -xfs_trans_t *tp, -xfs_dquot_t *dqp) +xfs_trans_t *tp, +struct xfs_dquot *dqp) {ASSERT (XFS_DQ_IS_LOCKED (dqp));
@@ -489,7 +489,7 @@ xfs_trans_unreserve_and_mod_dquots( xfs_trans_t *tp) {int i, j; -xfs_dquot_t *dqp; +struct xfs_dquot *dqp;struct xfs_dqtrx *qtrx, *qa;bool locked;
@@ -571,21 +571,21 @@ xfs_quota_warn(*/ STATIC intxfs_trans_dqresv ( -xfs_trans_t *tp, -xfs_mount_t *mp, -xfs_dquot_t *dqp, -int64_t nblks, -long ninos, -uint flags) +xfs_trans_t *tp, +xfs_mount_t *mp, +struct xfs_dquot *dqp, +int64_t nblks, +long ninos, +uint flags) { -xfs_qcnt_t hardlimit; -xfs_qcnt_t softlimit; -time_t timer; -xfs_qwarncnt_t warns; -xfs_qwarncnt_t warnlimit; -xfs_qcnt_t total_count; -xfs_qcnt_t *resbcountp; -xfs_quotainfo_t *q = mp->m_quotainfo; +xfs_qcnt_t hardlimit; +xfs_qcnt_t softlimit; +time_t timer; +xfs_qwarncnt_t warns; +xfs_qwarncnt_t warnlimit; +xfs_qcnt_t total_count; +xfs_qcnt_t *resbcountp; +xfs_quotainfo_t *q = mp->m_quotainfo;struct xfs_def_quota *defq;
Signature · 1 line
2.23.0
Re: [PATCH v2 1/4] xfs: remove the xfs_disk_dquot_t and xfs_dquot_t typedefs
Quoted 307 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- fs/xfs/libxfs/xfs_dquot_buf.c | 8 ++-- fs/xfs/libxfs/xfs_format.h | 10 ++--- fs/xfs/libxfs/xfs_trans_resv.c | 1 - fs/xfs/xfs_dquot.c | 18 ++++----- fs/xfs/xfs_dquot.h | 67 +++++++++++++++++----------------- fs/xfs/xfs_log_recover.c | 5 ++- fs/xfs/xfs_qm.c | 28 +++++++------- fs/xfs/xfs_qm_bhv.c | 2 +- fs/xfs/xfs_trans_dquot.c | 38 +++++++++---------- 9 files changed, 89 insertions(+), 88 deletions(-)fs/xfs/libxfs/xfs_dquot_buf.c +4
-4@@ -35,10 +35,10 @@ xfs_calc_dquots_per_chunk(xfs_failaddr_t xfs_dquot_verify ( -struct xfs_mount *mp, -xfs_disk_dquot_t *ddq, -xfs_dqid_t id, -uint type)/* used only during quotacheck */ +struct xfs_mount *mp, +struct xfs_disk_dquot *ddq, +xfs_dqid_t id, +uint type)/* used only during quotacheck */ {/* * We can encounter an uninitialized dquot buffer for 2 reasons: fs/xfs/libxfs/xfs_format.h +5
-5@@ -1144,11 +1144,11 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)/* * This is the main portion of the on-disk representation of quota -* information for a user. This is the q_core of the xfs_dquot_t that +* information for a user. This is the q_core of the struct xfs_dquot that * is kept in kernel memory. We pad this with some more expansion room * to construct the on disk structure. */ -typedef struct xfs_disk_dquot { +struct xfs_disk_dquot {__be16 d_magic;/* dquot magic = XFS_DQUOT_MAGIC */ __u8 d_version;/* dquot version */ __u8 d_flags;/* XFS_DQ_USER/PROJ/GROUP */ @@ -1171,15 +1171,15 @@ typedef struct xfs_disk_dquot {__be32 d_rtbtimer;/* similar to above; for RT disk blocks */ __be16 d_rtbwarns;/* warnings issued wrt RT disk blocks */ __be16 d_pad; -} xfs_disk_dquot_t; +};/* * 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 { - xfs_disk_dquot_t dd_diskdq; /* portion that lives incore as well */ - char dd_fill[4]; /* filling for posterity */ + struct xfs_disk_dquot dd_diskdq; /* portion living incore as well */ + char dd_fill[4];/* filling for posterity */ /* * These two are only present on filesystems with the CRC bits set.fs/xfs/libxfs/xfs_trans_resv.c +0
-1@@ -718,7 +718,6 @@ xfs_calc_clear_agi_bucket_reservation(/* * Adjusting quota limits. -* the xfs_disk_dquot_t: sizeof(struct xfs_disk_dquot) */ STATIC uintxfs_calc_qm_setqlim_reservation (void )fs/xfs/xfs_dquot.c +9
-9@@ -48,7 +48,7 @@ static struct lock_class_key xfs_dquot_project_class;*/ void xfs_qm_dqdestroy ( -xfs_dquot_t *dqp) +struct xfs_dquot *dqp) {ASSERT (list_empty (&dqp->q_lru));@@ -113,8 +113,8 @@ xfs_qm_adjust_dqlimits(*/ void xfs_qm_adjust_dqtimers ( -xfs_mount_t *mp, -xfs_disk_dquot_t *d) +struct xfs_mount *mp, +struct xfs_disk_dquot *d) {ASSERT (d->d_id);@@ -497,7 +497,7 @@ xfs_dquot_from_disk(struct xfs_disk_dquot *ddqp = bp->b_addr + dqp->q_bufoffset;/* copy everything from disk dquot to the incore dquot */ -memcpy (&dqp->q_core, ddqp,sizeof (xfs_disk_dquot_t)); +memcpy (&dqp->q_core, ddqp,sizeof (struct xfs_disk_dquot ));/* * Reservation counters are defined as reservation plus current usage @@ -989,7 +989,7 @@ xfs_qm_dqput(*/ void xfs_qm_dqrele ( -xfs_dquot_t *dqp) +struct xfs_dquot *dqp) {if (!dqp)return ;@@ -1019,7 +1019,7 @@ xfs_qm_dqflush_done( struct xfs_log_item *lip) {xfs_dq_logitem_t *qip = (struct xfs_dq_logitem *)lip; -xfs_dquot_t *dqp = qip->qli_dquot; +struct xfs_dquot *dqp = qip->qli_dquot;struct xfs_ail *ailp = lip->li_ailp;/* @@ -1130,7 +1130,7 @@ xfs_qm_dqflush( }/* This is the only portion of data that needs to persist */ -memcpy (ddqp, &dqp->q_core,sizeof (xfs_disk_dquot_t)); +memcpy (ddqp, &dqp->q_core,sizeof (struct xfs_disk_dquot ));/* * Clear the dirty field and remember the flush lsn for later use. @@ -1188,8 +1188,8 @@ xfs_qm_dqflush(*/ void xfs_dqlock2 ( -xfs_dquot_t *d1, -xfs_dquot_t *d2) +struct xfs_dquot *d1, +struct xfs_dquot *d2) {if (d1 && d2) {ASSERT (d1 != d2);fs/xfs/xfs_dquot.h +34
-33@@ -30,33 +30,33 @@ enum {/* * The incore dquot structure */ -typedef struct xfs_dquot { -uint dq_flags;/* various flags (XFS_DQ_*) */ -struct list_head q_lru;/* global free list of dquots */ -struct xfs_mount *q_mount;/* filesystem this relates to */ -uint q_nrefs;/* # active refs from inodes */ -xfs_daddr_t q_blkno;/* blkno of dquot buffer */ -int q_bufoffset;/* off of dq in buffer (# dquots) */ -xfs_fileoff_t q_fileoffset;/* offset in quotas file */ - -xfs_disk_dquot_t q_core;/* actual usage & quotas */ -xfs_dq_logitem_t q_logitem;/* dquot log item */ -xfs_qcnt_t q_res_bcount;/* total regular nblks used+reserved */ -xfs_qcnt_t q_res_icount;/* total inos allocd+reserved */ -xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ -xfs_qcnt_t q_prealloc_lo_wmark;/* prealloc throttle wmark */ -xfs_qcnt_t q_prealloc_hi_wmark;/* prealloc disabled wmark */ -int64_t q_low_space[XFS_QLOWSP_MAX ]; -struct mutex q_qlock;/* quota lock */ +struct xfs_dquot { +uint dq_flags;/* various flags (XFS_DQ_*) */ +struct list_head q_lru;/* global free list of dquots */ +struct xfs_mount *q_mount;/* filesystem this relates to */ +uint q_nrefs;/* # active refs from inodes */ +xfs_daddr_t q_blkno;/* blkno of dquot buffer */ +int q_bufoffset;/* off of dq in buffer (# dquots) */ +xfs_fileoff_t q_fileoffset;/* offset in quotas file */ + +struct xfs_disk_dquot q_core;/* actual usage & quotas */ +xfs_dq_logitem_t q_logitem;/* dquot log item */ +xfs_qcnt_t q_res_bcount;/* total regular nblks used+reserved */ +xfs_qcnt_t q_res_icount;/* total inos allocd+reserved */ +xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ +xfs_qcnt_t q_prealloc_lo_wmark;/* prealloc throttle wmark */ +xfs_qcnt_t q_prealloc_hi_wmark;/* prealloc disabled wmark */ +int64_t q_low_space[XFS_QLOWSP_MAX ]; +struct mutex q_qlock;/* quota lock */ struct completion q_flush;/* flush completion queue */ -atomic_t q_pincount;/* dquot pin count */ +atomic_t q_pincount;/* dquot pin count */ wait_queue_head_t q_pinwait;/* dquot pinning wait queue */ -}xfs_dquot_t ; +};/* * Lock hierarchy for q_qlock: * XFS_QLOCK_NORMAL is the implicit default, -* XFS_QLOCK_NESTED is the dquot with the higher id in xfs_dqlock2 +* XFS_QLOCK_NESTED is the dquot with the higher id in xfs_dqlock2 */ enum {XFS_QLOCK_NORMAL =0 ,@@ -68,17 +68,17 @@ enum {* queue synchronizes processes attempting to flush the in-core dquot back to * disk. */ -static inline void xfs_dqflock (xfs_dquot_t *dqp) +static inline void xfs_dqflock (struct xfs_dquot *dqp) {wait_for_completion (&dqp->q_flush); } -static inline bool xfs_dqflock_nowait (xfs_dquot_t *dqp) +static inline bool xfs_dqflock_nowait (struct xfs_dquot *dqp) {return try_wait_for_completion (&dqp->q_flush); } -static inline void xfs_dqfunlock (xfs_dquot_t *dqp) +static inline void xfs_dqfunlock (struct xfs_dquot *dqp) {complete (&dqp->q_flush); }@@ -112,7 +112,7 @@ static inline int xfs_this_quota_on(struct xfs_mount *mp, int type) } } -static inline xfs_dquot_t *xfs_inode_dquot (struct xfs_inode *ip,int type) +static inline struct xfs_dquot *xfs_inode_dquot (struct xfs_inode *ip,int type) {switch (type &XFS_DQ_ALLTYPES ) {case XFS_DQ_USER :@@ -147,13 +147,14 @@ static inline bool xfs_dquot_lowsp(struct xfs_dquot *dqp)#define XFS_QM_ISPDQ (dqp) ((dqp)->dq_flags & XFS_DQ_PROJ)#define XFS_QM_ISGDQ (dqp) ((dqp)->dq_flags & XFS_DQ_GROUP) -extern void xfs_qm_dqdestroy (xfs_dquot_t *); -extern int xfs_qm_dqflush (struct xfs_dquot *,struct xfs_buf **); -extern void xfs_qm_dqunpin_wait (xfs_dquot_t *); -extern void xfs_qm_adjust_dqtimers (xfs_mount_t *, -xfs_disk_dquot_t *); -extern void xfs_qm_adjust_dqlimits (struct xfs_mount *, -struct xfs_dquot *); +extern void xfs_qm_dqdestroy (struct xfs_dquot *dqp); +extern int xfs_qm_dqflush (struct xfs_dquot *dqp, +struct xfs_buf **bpp); +extern void xfs_qm_dqunpin_wait (struct xfs_dquot *dqp); +extern void xfs_qm_adjust_dqtimers (xfs_mount_t *mp, +struct xfs_disk_dquot *d); +extern void xfs_qm_adjust_dqlimits (struct xfs_mount *mp, +struct xfs_dquot *d);extern xfs_dqid_t xfs_qm_id_for_quotatype (struct xfs_inode *ip,uint type); extern int xfs_qm_dqget(struct xfs_mount *mp, xfs_dqid_t id,@@ -167,7 +168,7 @@ extern int xfs_qm_dqget_next(struct xfs_mount *mp, xfs_dqid_t id,extern int xfs_qm_dqget_uncached (struct xfs_mount *mp,xfs_dqid_t id,uint type,struct xfs_dquot **dqpp); -extern void xfs_qm_dqput (xfs_dquot_t *); +extern void xfs_qm_dqput (struct xfs_dquot *dqp);extern void xfs_dqlock2 (struct xfs_dquot *,struct xfs_dquot *);fs/xfs/xfs_log_recover.c +3
-2@@ -2576,6 +2576,7 @@ xlog_recover_do_reg_buffer(int bit;int nbits;xfs_failaddr_t fa; +const size_t size_disk_dquot =sizeof (struct xfs_disk_dquot );trace_xfs_log_recover_buf_reg_buf (mp->m_log, buf_f);@@ -2618,7 +2619,7 @@ xlog_recover_do_reg_buffer( "XFS: NULL dquot in %s.", __func__); goto next; } -if (item->ri_buf[i].i_len <sizeof (xfs_disk_dquot_t)) { +if (item->ri_buf[i].i_len < size_disk_dquot) {xfs_alert (mp,"XFS: dquot too small (%d) in %s." , item->ri_buf[i].i_len, __func__);@@ -3249,7 +3250,7 @@ xlog_recover_dquot_pass2(xfs_alert (log->l_mp,"NULL dquot in %s." , __func__);return -EIO ; } -if (item->ri_buf[1 ].i_len <sizeof (xfs_disk_dquot_t)) { +if (item->ri_buf[1 ].i_len <sizeof (struct xfs_disk_dquot )) {xfs_alert (log->l_mp,"dquot too small (%d) in %s." , item->ri_buf[1 ].i_len, __func__);return -EIO ;fs/xfs/xfs_qm.c +0
-0
fs/xfs/xfs_qm.c xfs_qm_unmount_quotas( · line 247
Quoted 9 lines
fs/xfs/xfs_qm.c +1
-5@@ -244,14 +244,14 @@ xfs_qm_unmount_quotas( STATIC int xfs_qm_dqattach_one( -xfs_inode_t *ip, -xfs_dqid_t id, -uint type, -bool doalloc, -xfs_dquot_t **IO_idqpp) + xfs_inode_t *ip,
Please de-typedef /all/ the parameters in /all/ of the structure definitions, function declarations, function definitions, and local variable definition clusters you touch.
Sorry, I should've mentioned that explicitly when reviewing the v1 patchset. I forgot that unwritten convention isn't universally known. :/
--D
Quoted 129 lines
fs/xfs/xfs_qm.c +13
-9+xfs_dqid_t id, + uint type, + bool doalloc, + struct xfs_dquot **IO_idqpp) { -xfs_dquot_t *dqp; -int error; + struct xfs_dquot *dqp; +int error;ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL )); error =0 ;@@ -544,7 +544,7 @@ xfs_qm_set_defquota(uint type, xfs_quotainfo_t *qinf) { - xfs_dquot_t *dqp; + struct xfs_dquot *dqp;struct xfs_def_quota *defq;struct xfs_disk_dquot *ddqp;int error;@@ -1746,14 +1746,14 @@ xfs_qm_vop_dqalloc(* Actually transfer ownership, and do dquot modifications. * These were already reserved. */ -xfs_dquot_t * +struct xfs_dquot *xfs_qm_vop_chown ( -xfs_trans_t *tp, -xfs_inode_t *ip, -xfs_dquot_t **IO_olddq, -xfs_dquot_t *newdq) +xfs_trans_t *tp, +xfs_inode_t *ip, +struct xfs_dquot **IO_olddq, +struct xfs_dquot *newdq) { -xfs_dquot_t *prevdq; +struct xfs_dquot *prevdq;uint bfield =XFS_IS_REALTIME_INODE (ip) ?XFS_TRANS_DQ_RTBCOUNT :XFS_TRANS_DQ_BCOUNT ;fs/xfs/xfs_qm_bhv.c +1
-1@@ -58,7 +58,7 @@ xfs_qm_statvfs( struct kstatfs *statp) {xfs_mount_t *mp = ip->i_mount; -xfs_dquot_t *dqp; +struct xfs_dquot *dqp;if (!xfs_qm_dqget (mp,xfs_get_projid (ip),XFS_DQ_PROJ , false, &dqp)) {xfs_fill_statvfs_from_dquot (statp, dqp);fs/xfs/xfs_trans_dquot.c +19
-19@@ -25,8 +25,8 @@ STATIC void xfs_trans_alloc_dqinfo(xfs_trans_t *);*/ void xfs_trans_dqjoin ( -xfs_trans_t *tp, -xfs_dquot_t *dqp) +xfs_trans_t *tp, +struct xfs_dquot *dqp) {ASSERT (XFS_DQ_IS_LOCKED (dqp));ASSERT (dqp->q_logitem.qli_dquot == dqp);@@ -49,8 +49,8 @@ xfs_trans_dqjoin(*/ void xfs_trans_log_dquot ( -xfs_trans_t *tp, -xfs_dquot_t *dqp) +xfs_trans_t *tp, +struct xfs_dquot *dqp) {ASSERT (XFS_DQ_IS_LOCKED (dqp));@@ -489,7 +489,7 @@ xfs_trans_unreserve_and_mod_dquots( xfs_trans_t *tp) {int i, j; -xfs_dquot_t *dqp; +struct xfs_dquot *dqp;struct xfs_dqtrx *qtrx, *qa;bool locked;@@ -571,21 +571,21 @@ xfs_quota_warn(*/ STATIC intxfs_trans_dqresv ( -xfs_trans_t *tp, -xfs_mount_t *mp, -xfs_dquot_t *dqp, -int64_t nblks, -long ninos, -uint flags) +xfs_trans_t *tp, +xfs_mount_t *mp, +struct xfs_dquot *dqp, +int64_t nblks, +long ninos, +uint flags) { -xfs_qcnt_t hardlimit; -xfs_qcnt_t softlimit; -time_t timer; -xfs_qwarncnt_t warns; -xfs_qwarncnt_t warnlimit; -xfs_qcnt_t total_count; -xfs_qcnt_t *resbcountp; -xfs_quotainfo_t *q = mp->m_quotainfo; +xfs_qcnt_t hardlimit; +xfs_qcnt_t softlimit; +time_t timer; +xfs_qwarncnt_t warns; +xfs_qwarncnt_t warnlimit; +xfs_qcnt_t total_count; +xfs_qcnt_t *resbcountp; +xfs_quotainfo_t *q = mp->m_quotainfo;struct xfs_def_quota *defq;Signature · 1 line
2.23.0
PATCH v2 2/4 xfs: remove the xfs_quotainfo_t typedef
In reply to Pavel Reichl--- fs/xfs/xfs_qm.c | 20 ++++++++++---------- fs/xfs/xfs_qm.h | 4 ++-- fs/xfs/xfs_trans_dquot.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)
fs/xfs/xfs_qm.c +10 -10
@@ -30,10 +30,10 @@* quota functionality, including maintaining the freelist and hash * tables of dquots. */ -STATIC int xfs_qm_init_quotainos(xfs_mount_t *); -STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); +STATIC int xfs_qm_init_quotainos(struct xfs_mount *mp); +STATIC int xfs_qm_init_quotainfo(struct xfs_mount *mp); -STATIC void xfs_qm_destroy_quotainos(xfs_quotainfo_t *qi); +STATIC void xfs_qm_destroy_quotainos(struct xfs_quotainfo *qi); STATIC void xfs_qm_dqfree_one(struct xfs_dquot *dqp);/* * We use the batch lookup interface to iterate over the dquots as it
@@ -540,9 +540,9 @@ xfs_qm_shrink_count( STATIC voidxfs_qm_set_defquota ( -xfs_mount_t *mp, -uint type, -xfs_quotainfo_t *qinf) +struct xfs_mount *mp, +uint type, +struct xfs_quotainfo *qinf) {struct xfs_dquot *dqp;struct xfs_def_quota *defq;
@@ -643,7 +643,7 @@ xfs_qm_init_quotainfo(ASSERT (XFS_IS_QUOTA_RUNNING (mp)); - qinf = mp->m_quotainfo =kmem_zalloc (sizeof (xfs_quotainfo_t),0 ); + qinf = mp->m_quotainfo =kmem_zalloc (sizeof (struct xfs_quotainfo ),0 ); error =list_lru_init (&qinf->qi_lru);if (error)
@@ -710,9 +710,9 @@ xfs_qm_init_quotainfo(*/ void xfs_qm_destroy_quotainfo ( -xfs_mount_t *mp) +struct xfs_mount *mp) { -xfs_quotainfo_t *qi; +struct xfs_quotainfo *qi; qi = mp->m_quotainfo;ASSERT (qi !=NULL );
@@ -1568,7 +1568,7 @@ xfs_qm_init_quotainos( STATIC voidxfs_qm_destroy_quotainos ( -xfs_quotainfo_t *qi) +struct xfs_quotainfo *qi) {if (qi->qi_uquotaip) {xfs_irele (qi->qi_uquotaip);
fs/xfs/xfs_qm.h +2 -2
@@ -54,7 +54,7 @@ struct xfs_def_quota {* Various quota information for individual filesystems. * The mount structure keeps a pointer to this. */ -typedef struct xfs_quotainfo { +struct xfs_quotainfo {struct radix_tree_root qi_uquota_tree;struct radix_tree_root qi_gquota_tree;struct radix_tree_root qi_pquota_tree;
@@ -77,7 +77,7 @@ typedef struct xfs_quotainfo {struct xfs_def_quota qi_grp_default;struct xfs_def_quota qi_prj_default;struct shrinker qi_shrinker; -} xfs_quotainfo_t; +};static inline struct radix_tree_root * xfs_dquot_tree(
fs/xfs/xfs_trans_dquot.c +1 -1
@@ -585,7 +585,7 @@ xfs_trans_dqresv(xfs_qwarncnt_t warnlimit;xfs_qcnt_t total_count;xfs_qcnt_t *resbcountp; -xfs_quotainfo_t *q = mp->m_quotainfo; +struct xfs_quotainfo *q = mp->m_quotainfo;struct xfs_def_quota *defq;
Signature · 1 line
2.23.0
Re: [PATCH v2 2/4] xfs: remove the xfs_quotainfo_t typedef
Quoted 48 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- fs/xfs/xfs_qm.c | 20 ++++++++++---------- fs/xfs/xfs_qm.h | 4 ++-- fs/xfs/xfs_trans_dquot.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)fs/xfs/xfs_qm.c +7
-7@@ -30,10 +30,10 @@* quota functionality, including maintaining the freelist and hash * tables of dquots. */ -STATIC int xfs_qm_init_quotainos(xfs_mount_t *); -STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); +STATIC int xfs_qm_init_quotainos(struct xfs_mount *mp); +STATIC int xfs_qm_init_quotainfo(struct xfs_mount *mp); -STATIC void xfs_qm_destroy_quotainos(xfs_quotainfo_t *qi); +STATIC void xfs_qm_destroy_quotainos(struct xfs_quotainfo *qi); STATIC void xfs_qm_dqfree_one(struct xfs_dquot *dqp);/* * We use the batch lookup interface to iterate over the dquots as it @@ -540,9 +540,9 @@ xfs_qm_shrink_count( STATIC voidxfs_qm_set_defquota ( -xfs_mount_t *mp, -uint type, -xfs_quotainfo_t *qinf) +struct xfs_mount *mp, +uint type, +struct xfs_quotainfo *qinf) {struct xfs_dquot *dqp;struct xfs_def_quota *defq;@@ -643,7 +643,7 @@ xfs_qm_init_quotainfo(ASSERT (XFS_IS_QUOTA_RUNNING (mp)); - qinf = mp->m_quotainfo =kmem_zalloc (sizeof (xfs_quotainfo_t),0 ); + qinf = mp->m_quotainfo =kmem_zalloc (sizeof (struct xfs_quotainfo ),0 ); error =list_lru_init (&qinf->qi_lru);if (error)
fs/xfs/xfs_qm.c xfs_qm_init_quotainfo( · line 713
Quoted 5 lines
fs/xfs/xfs_qm.c +1
-1@@ -710,9 +710,9 @@ xfs_qm_init_quotainfo(*/ void xfs_qm_destroy_quotainfo ( -xfs_mount_t *mp) +struct xfs_mount *mp)
This indentation here ^^^^^ should be tabs, not spaces.
fs/xfs/xfs_qm.c xfs_qm_init_quotainfo( · line 715
Quoted 3 lines
fs/xfs/xfs_qm.c +1
-1{ -xfs_quotainfo_t *qi; +struct xfs_quotainfo *qi;
Please fix this space here ^ to be a tab too.
(FYI, the 'list' option in vim will show you tabs vs. spaces to make your life easier...)
--D
Quoted 50 lines
fs/xfs/xfs_qm.c +1
-1qi = mp->m_quotainfo;ASSERT (qi !=NULL );@@ -1568,7 +1568,7 @@ xfs_qm_init_quotainos( STATIC voidxfs_qm_destroy_quotainos ( -xfs_quotainfo_t *qi) +struct xfs_quotainfo *qi) {if (qi->qi_uquotaip) {xfs_irele (qi->qi_uquotaip);fs/xfs/xfs_qm.h +2
-2@@ -54,7 +54,7 @@ struct xfs_def_quota {* Various quota information for individual filesystems. * The mount structure keeps a pointer to this. */ -typedef struct xfs_quotainfo { +struct xfs_quotainfo {struct radix_tree_root qi_uquota_tree;struct radix_tree_root qi_gquota_tree;struct radix_tree_root qi_pquota_tree;@@ -77,7 +77,7 @@ typedef struct xfs_quotainfo {struct xfs_def_quota qi_grp_default;struct xfs_def_quota qi_prj_default;struct shrinker qi_shrinker; -} xfs_quotainfo_t; +};static inline struct radix_tree_root * xfs_dquot_tree(fs/xfs/xfs_trans_dquot.c +1
-1@@ -585,7 +585,7 @@ xfs_trans_dqresv(xfs_qwarncnt_t warnlimit;xfs_qcnt_t total_count;xfs_qcnt_t *resbcountp; -xfs_quotainfo_t *q = mp->m_quotainfo; +struct xfs_quotainfo *q = mp->m_quotainfo;struct xfs_def_quota *defq;Signature · 1 line
2.23.0
Re: [PATCH v2 2/4] xfs: remove the xfs_quotainfo_t typedef
Hello Darrick,
thanks for your patience with this patchset and for catching these issues.
I'm in the process of improving my vimrc so these little embarrassment will soon disappear from my patches completely...hopefully :-)
Bye.
Pavel
Quoted 118 lines · Darrick J. Wong
Quoted 48 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- fs/xfs/xfs_qm.c | 20 ++++++++++---------- fs/xfs/xfs_qm.h | 4 ++-- fs/xfs/xfs_trans_dquot.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)fs/xfs/xfs_qm.c +7
-7@@ -30,10 +30,10 @@* quota functionality, including maintaining the freelist and hash * tables of dquots. */ -STATIC int xfs_qm_init_quotainos(xfs_mount_t *); -STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); +STATIC int xfs_qm_init_quotainos(struct xfs_mount *mp); +STATIC int xfs_qm_init_quotainfo(struct xfs_mount *mp); -STATIC void xfs_qm_destroy_quotainos(xfs_quotainfo_t *qi); +STATIC void xfs_qm_destroy_quotainos(struct xfs_quotainfo *qi); STATIC void xfs_qm_dqfree_one(struct xfs_dquot *dqp);/* * We use the batch lookup interface to iterate over the dquots as it @@ -540,9 +540,9 @@ xfs_qm_shrink_count( STATIC voidxfs_qm_set_defquota ( -xfs_mount_t *mp, -uint type, -xfs_quotainfo_t *qinf) +struct xfs_mount *mp, +uint type, +struct xfs_quotainfo *qinf) {struct xfs_dquot *dqp;struct xfs_def_quota *defq;@@ -643,7 +643,7 @@ xfs_qm_init_quotainfo(ASSERT (XFS_IS_QUOTA_RUNNING (mp)); - qinf = mp->m_quotainfo =kmem_zalloc (sizeof (xfs_quotainfo_t),0 ); + qinf = mp->m_quotainfo =kmem_zalloc (sizeof (struct xfs_quotainfo ),0 ); error =list_lru_init (&qinf->qi_lru);if (error)fs/xfs/xfs_qm.c xfs_qm_init_quotainfo( · line 713
Quoted 5 lines
fs/xfs/xfs_qm.c +1
-1@@ -710,9 +710,9 @@ xfs_qm_init_quotainfo(*/ void xfs_qm_destroy_quotainfo ( -xfs_mount_t *mp) +struct xfs_mount *mp)This indentation here ^^^^^ should be tabs, not spaces.
fs/xfs/xfs_qm.c xfs_qm_init_quotainfo( · line 715
Quoted 3 lines
fs/xfs/xfs_qm.c +1
-1{ -xfs_quotainfo_t *qi; +struct xfs_quotainfo *qi;Please fix this space here ^ to be a tab too.
(FYI, the 'list' option in vim will show you tabs vs. spaces to make your life easier...)
--D
Quoted 50 lines
fs/xfs/xfs_qm.c +1
-1qi = mp->m_quotainfo;ASSERT (qi !=NULL );@@ -1568,7 +1568,7 @@ xfs_qm_init_quotainos( STATIC voidxfs_qm_destroy_quotainos ( -xfs_quotainfo_t *qi) +struct xfs_quotainfo *qi) {if (qi->qi_uquotaip) {xfs_irele (qi->qi_uquotaip);fs/xfs/xfs_qm.h +2
-2@@ -54,7 +54,7 @@ struct xfs_def_quota {* Various quota information for individual filesystems. * The mount structure keeps a pointer to this. */ -typedef struct xfs_quotainfo { +struct xfs_quotainfo {struct radix_tree_root qi_uquota_tree;struct radix_tree_root qi_gquota_tree;struct radix_tree_root qi_pquota_tree;@@ -77,7 +77,7 @@ typedef struct xfs_quotainfo {struct xfs_def_quota qi_grp_default;struct xfs_def_quota qi_prj_default;struct shrinker qi_shrinker; -} xfs_quotainfo_t; +};static inline struct radix_tree_root * xfs_dquot_tree(fs/xfs/xfs_trans_dquot.c +1
-2@@ -585,7 +585,7 @@ xfs_trans_dqresv(xfs_qwarncnt_t warnlimit;xfs_qcnt_t total_count;xfs_qcnt_t *resbcountp; -xfs_quotainfo_t *q = mp->m_quotainfo; +struct xfs_quotainfo *q = mp->m_quotainfo;struct xfs_def_quota *defq; --2.23.0
PATCH v2 3/4 xfs: remove the xfs_dq_logitem_t typedef
In reply to Pavel Reichl--- fs/xfs/xfs_dquot.c | 2 +- fs/xfs/xfs_dquot.h | 18 +++++++++--------- fs/xfs/xfs_dquot_item.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
fs/xfs/xfs_dquot.c +1 -1
@@ -1018,7 +1018,7 @@ xfs_qm_dqflush_done(struct xfs_buf *bp, struct xfs_log_item *lip) { - xfs_dq_logitem_t *qip = (struct xfs_dq_logitem *)lip; + struct xfs_dq_logitem *qip = (struct xfs_dq_logitem *)lip;struct xfs_dquot *dqp = qip->qli_dquot;struct xfs_ail *ailp = lip->li_ailp;
fs/xfs/xfs_dquot.h +9 -9
@@ -39,15 +39,15 @@ struct xfs_dquot {int q_bufoffset;/* off of dq in buffer (# dquots) */ xfs_fileoff_t q_fileoffset;/* offset in quotas file */ -struct xfs_disk_dquot q_core;/* actual usage & quotas */ -xfs_dq_logitem_t q_logitem;/* dquot log item */ -xfs_qcnt_t q_res_bcount;/* total regular nblks used+reserved */ -xfs_qcnt_t q_res_icount;/* total inos allocd+reserved */ -xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ -xfs_qcnt_t q_prealloc_lo_wmark;/* prealloc throttle wmark */ -xfs_qcnt_t q_prealloc_hi_wmark;/* prealloc disabled wmark */ -int64_t q_low_space[XFS_QLOWSP_MAX ]; -struct mutex q_qlock;/* quota lock */ +struct xfs_disk_dquot q_core;/* actual usage & quotas */ +struct xfs_dq_logitem q_logitem;/* dquot log item */ +xfs_qcnt_t q_res_bcount;/* total regular nblks used+reserved */ +xfs_qcnt_t q_res_icount;/* total inos allocd+reserved */ +xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ +xfs_qcnt_t q_prealloc_lo_wmark;/* prealloc throttle wmark */ +xfs_qcnt_t q_prealloc_hi_wmark;/* prealloc disabled wmark */ +int64_t q_low_space[XFS_QLOWSP_MAX ]; +struct mutex q_qlock;/* quota lock */ struct completion q_flush;/* flush completion queue */ atomic_t q_pincount;/* dquot pin count */ wait_queue_head_t q_pinwait;/* dquot pinning wait queue */
fs/xfs/xfs_dquot_item.h +2 -2
@@ -11,11 +11,11 @@ struct xfs_trans;struct xfs_mount ;struct xfs_qoff_logitem ; -typedef struct xfs_dq_logitem { +struct xfs_dq_logitem {struct xfs_log_item qli_item;/* common portion */ struct xfs_dquot *qli_dquot;/* dquot ptr */ xfs_lsn_t qli_flush_lsn;/* lsn at last flush */ -}xfs_dq_logitem_t ; +}; typedef struct xfs_qoff_logitem { struct xfs_log_item qql_item; /* common portion */
Signature · 1 line
2.23.0
Re: [PATCH v2 3/4] xfs: remove the xfs_dq_logitem_t typedef
Quoted 37 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- fs/xfs/xfs_dquot.c | 2 +- fs/xfs/xfs_dquot.h | 18 +++++++++--------- fs/xfs/xfs_dquot_item.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)fs/xfs/xfs_dquot.c +1
-1@@ -1018,7 +1018,7 @@ xfs_qm_dqflush_done(struct xfs_buf *bp, struct xfs_log_item *lip) { - xfs_dq_logitem_t *qip = (struct xfs_dq_logitem *)lip; + struct xfs_dq_logitem *qip = (struct xfs_dq_logitem *)lip;struct xfs_dquot *dqp = qip->qli_dquot;struct xfs_ail *ailp = lip->li_ailp;fs/xfs/xfs_dquot.h +0
-9@@ -39,15 +39,15 @@ struct xfs_dquot {int q_bufoffset;/* off of dq in buffer (# dquots) */ xfs_fileoff_t q_fileoffset;/* offset in quotas file */ -struct xfs_disk_dquot q_core;/* actual usage & quotas */ -xfs_dq_logitem_t q_logitem;/* dquot log item */ -xfs_qcnt_t q_res_bcount;/* total regular nblks used+reserved */ -xfs_qcnt_t q_res_icount;/* total inos allocd+reserved */ -xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ -xfs_qcnt_t q_prealloc_lo_wmark;/* prealloc throttle wmark */ -xfs_qcnt_t q_prealloc_hi_wmark;/* prealloc disabled wmark */ -int64_t q_low_space[XFS_QLOWSP_MAX ]; -struct mutex q_qlock;/* quota lock */
fs/xfs/xfs_dquot.h struct xfs_dquot { · line 51
Quoted 10 lines
fs/xfs/xfs_dquot.h +9
-0+struct xfs_disk_dquot q_core;/* actual usage & quotas */ +struct xfs_dq_logitem q_logitem;/* dquot log item */ +xfs_qcnt_t q_res_bcount;/* total regular nblks used+reserved */ +xfs_qcnt_t q_res_icount;/* total inos allocd+reserved */ +xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ +xfs_qcnt_t q_prealloc_lo_wmark;/* prealloc throttle wmark */ +xfs_qcnt_t q_prealloc_hi_wmark;/* prealloc disabled wmark */ +int64_t q_low_space[XFS_QLOWSP_MAX ]; +struct mutex q_qlock;/* quota lock */ struct completion q_flush;/* flush completion queue */
These look like they're more misaligned than the previous patch.
Please consider reformatting the structure from:
some_type some_variable; /* squashed comment */
into:
/* not as squashed of a comment */ some_type some_variable;
Because that's a lot less cluttered, and it means that you can actually make all the field names line up without having to worry about how much that will screw up the comments.
--D
Quoted 23 lines
fs/xfs/xfs_dquot.h +0
-0atomic_t q_pincount;/* dquot pin count */ wait_queue_head_t q_pinwait;/* dquot pinning wait queue */ fs/xfs/xfs_dquot_item.h +2
-2@@ -11,11 +11,11 @@ struct xfs_trans;struct xfs_mount ;struct xfs_qoff_logitem ; -typedef struct xfs_dq_logitem { +struct xfs_dq_logitem {struct xfs_log_item qli_item;/* common portion */ struct xfs_dquot *qli_dquot;/* dquot ptr */ xfs_lsn_t qli_flush_lsn;/* lsn at last flush */ -}xfs_dq_logitem_t ; +}; typedef struct xfs_qoff_logitem { struct xfs_log_item qql_item; /* common portion */Signature · 1 line
2.23.0
PATCH v2 4/4 xfs: remove the xfs_qoff_logitem_t typedef
In reply to Pavel Reichl--- fs/xfs/libxfs/xfs_trans_resv.c | 4 ++-- fs/xfs/xfs_dquot_item.h | 14 ++++++++------ fs/xfs/xfs_qm_syscalls.c | 35 ++++++++++++++++++---------------- fs/xfs/xfs_trans_dquot.c | 14 +++++++------- 4 files changed, 36 insertions(+), 31 deletions(-)
fs/xfs/libxfs/xfs_trans_resv.c +2 -2
@@ -741,7 +741,7 @@ xfs_calc_qm_dqalloc_reservation(/* * Turning off quotas. -* the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 +* sizeof(struct xfs_qoff_logitem) * 2 * the superblock for the quota flags: sector size */ STATIC uint
@@ -754,7 +754,7 @@ xfs_calc_qm_quotaoff_reservation(/* * End of turning off quotas. -* the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 +* sizeof(struct xfs_qoff_logitem) * 2 */ STATIC uintxfs_calc_qm_quotaoff_end_reservation (void )
fs/xfs/xfs_dquot_item.h +8 -6
@@ -17,18 +17,20 @@ struct xfs_dq_logitem {xfs_lsn_t qli_flush_lsn;/* lsn at last flush */ }; -typedef struct xfs_qoff_logitem { +struct xfs_qoff_logitem {struct xfs_log_item qql_item;/* common portion */ struct xfs_qoff_logitem *qql_start_lip;/* qoff-start logitem, if any */ unsigned int qql_flags; -}xfs_qoff_logitem_t ; +};extern void xfs_qm_dquot_logitem_init (struct xfs_dquot *); -extern xfs_qoff_logitem_t *xfs_qm_qoff_logitem_init (struct xfs_mount *, -struct xfs_qoff_logitem *,uint ); -extern xfs_qoff_logitem_t *xfs_trans_get_qoff_item (struct xfs_trans *, -struct xfs_qoff_logitem *,uint ); +extern struct xfs_qoff_logitem *xfs_qm_qoff_logitem_init (struct xfs_mount *mp, +struct xfs_qoff_logitem *start, +uint flags); +extern struct xfs_qoff_logitem *xfs_trans_get_qoff_item (struct xfs_trans *tp, +struct xfs_qoff_logitem *startqoff, +uint flags);extern void xfs_trans_log_quotaoff_item (struct xfs_trans *,struct xfs_qoff_logitem *);
fs/xfs/xfs_qm_syscalls.c +19 -16
@@ -19,9 +19,12 @@#include "xfs_qm.h" #include "xfs_icache.h" -STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint); -STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *, -uint ); +STATIC int xfs_qm_log_quotaoff(struct xfs_mount *mp, +struct xfs_qoff_logitem **qoffstartp, +uint flags); +STATIC int xfs_qm_log_quotaoff_end(struct xfs_mount *mp, +struct xfs_qoff_logitem *startqoff, +uint flags);/* * Turn off quota accounting and/or enforcement for all udquots and/or
@@ -40,7 +43,7 @@ xfs_qm_scall_quotaoff(uint dqtype;int error;uint inactivate_flags; -xfs_qoff_logitem_t *qoffstart; +struct xfs_qoff_logitem *qoffstart;/* * No file system can have quotas enabled on disk but not in core.
@@ -540,13 +543,13 @@ xfs_qm_scall_setqlim( STATIC intxfs_qm_log_quotaoff_end ( -xfs_mount_t *mp, -xfs_qoff_logitem_t *startqoff, -uint flags) +struct xfs_mount *mp, +struct xfs_qoff_logitem *startqoff, +uint flags) { -xfs_trans_t *tp; -int error; -xfs_qoff_logitem_t *qoffi; +struct xfs_trans *tp; +int error; +struct xfs_qoff_logitem *qoffi; error =xfs_trans_alloc (mp, &M_RES (mp)->tr_qm_equotaoff,0 ,0 ,0 , &tp);if (error)
@@ -568,13 +571,13 @@ xfs_qm_log_quotaoff_end( STATIC intxfs_qm_log_quotaoff ( -xfs_mount_t *mp, -xfs_qoff_logitem_t **qoffstartp, -uint flags) +struct xfs_mount *mp, +struct xfs_qoff_logitem **qoffstartp, +uint flags) { -xfs_trans_t *tp; -int error; -xfs_qoff_logitem_t *qoffi; +struct xfs_trans *tp; +int error; +struct xfs_qoff_logitem *qoffi; *qoffstartp =NULL ;
fs/xfs/xfs_trans_dquot.c +7 -7
@@ -824,13 +824,13 @@ xfs_trans_reserve_quota_nblks(/* * This routine is called to allocate a quotaoff log item. */ -xfs_qoff_logitem_t * +struct xfs_qoff_logitem *xfs_trans_get_qoff_item ( -xfs_trans_t *tp, -xfs_qoff_logitem_t *startqoff, -uint flags) +struct xfs_trans *tp, +struct xfs_qoff_logitem *startqoff, +uint flags) { -xfs_qoff_logitem_t *q; +struct xfs_qoff_logitem *q;ASSERT (tp !=NULL );
@@ -852,8 +852,8 @@ xfs_trans_get_qoff_item(*/ void xfs_trans_log_quotaoff_item ( -xfs_trans_t *tp, -xfs_qoff_logitem_t *qlp) +struct xfs_trans *tp, +struct xfs_qoff_logitem *qlp) { tp->t_flags |=XFS_TRANS_DIRTY ;set_bit (XFS_LI_DIRTY , &qlp->qql_item.li_flags);
Signature · 1 line
2.23.0
Re: [PATCH v2 4/4] xfs: remove the xfs_qoff_logitem_t typedef
Quoted 48 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- fs/xfs/libxfs/xfs_trans_resv.c | 4 ++-- fs/xfs/xfs_dquot_item.h | 14 ++++++++------ fs/xfs/xfs_qm_syscalls.c | 35 ++++++++++++++++++---------------- fs/xfs/xfs_trans_dquot.c | 14 +++++++------- 4 files changed, 36 insertions(+), 31 deletions(-)fs/xfs/libxfs/xfs_trans_resv.c +2
-2@@ -741,7 +741,7 @@ xfs_calc_qm_dqalloc_reservation(/* * Turning off quotas. -* the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 +* sizeof(struct xfs_qoff_logitem) * 2 * the superblock for the quota flags: sector size */ STATIC uint@@ -754,7 +754,7 @@ xfs_calc_qm_quotaoff_reservation(/* * End of turning off quotas. -* the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 +* sizeof(struct xfs_qoff_logitem) * 2 */ STATIC uintxfs_calc_qm_quotaoff_end_reservation (void )fs/xfs/xfs_dquot_item.h +2
-2@@ -17,18 +17,20 @@ struct xfs_dq_logitem {xfs_lsn_t qli_flush_lsn;/* lsn at last flush */ }; -typedef struct xfs_qoff_logitem { +struct xfs_qoff_logitem {struct xfs_log_item qql_item;/* common portion */ struct xfs_qoff_logitem *qql_start_lip;/* qoff-start logitem, if any */ unsigned int qql_flags; -}xfs_qoff_logitem_t ; +};extern void xfs_qm_dquot_logitem_init (struct xfs_dquot *);
fs/xfs/xfs_dquot_item.h struct xfs_dq_logitem { · line 33
Quoted 10 lines
fs/xfs/xfs_dquot_item.h +6
-4-extern xfs_qoff_logitem_t *xfs_qm_qoff_logitem_init (struct xfs_mount *, -struct xfs_qoff_logitem *,uint ); -extern xfs_qoff_logitem_t *xfs_trans_get_qoff_item (struct xfs_trans *, -struct xfs_qoff_logitem *,uint ); +extern struct xfs_qoff_logitem *xfs_qm_qoff_logitem_init (struct xfs_mount *mp, +struct xfs_qoff_logitem *start, +uint flags); +extern struct xfs_qoff_logitem *xfs_trans_get_qoff_item (struct xfs_trans *tp, +struct xfs_qoff_logitem *startqoff, +uint flags);
Kill the 'extern's, and only indent the second and third lines twice:
struct xfs_qoff_logitem *xfs_trans_get_qoff_item(struct xfs_trans *tp,
struct xfs_qoff_logitem *startqoff, uint flags);
(Here and everywhere else...)
((Others will have different opinions about indentation but I'm lazy and only bother doing two indents, like a lot of code in XFS.))
(((I personally dislike the kernel indent style because I don't want to spend brainpower making all the spaces line up just exactly; I'd rather just put in my two tabs with muscle memory and concentrate on getting the code to work properly.)))
Quoted 38 lines
fs/xfs/xfs_dquot_item.h +0
-0extern void xfs_trans_log_quotaoff_item (struct xfs_trans *,struct xfs_qoff_logitem *);fs/xfs/xfs_qm_syscalls.c +7
-6@@ -19,9 +19,12 @@#include "xfs_qm.h" #include "xfs_icache.h" -STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint); -STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *, -uint ); +STATIC int xfs_qm_log_quotaoff(struct xfs_mount *mp, +struct xfs_qoff_logitem **qoffstartp, +uint flags); +STATIC int xfs_qm_log_quotaoff_end(struct xfs_mount *mp, +struct xfs_qoff_logitem *startqoff, +uint flags);/* * Turn off quota accounting and/or enforcement for all udquots and/or @@ -40,7 +43,7 @@ xfs_qm_scall_quotaoff(uint dqtype;int error;uint inactivate_flags; -xfs_qoff_logitem_t *qoffstart; +struct xfs_qoff_logitem *qoffstart;/* * No file system can have quotas enabled on disk but not in core. @@ -540,13 +543,13 @@ xfs_qm_scall_setqlim( STATIC int xfs_qm_log_quotaoff_end( - xfs_mount_t *mp, - xfs_qoff_logitem_t *startqoff,
fs/xfs/xfs_qm_syscalls.c xfs_qm_scall_setqlim( · line 551
Quoted 10 lines
fs/xfs/xfs_qm_syscalls.c +5
-4- uint flags) +struct xfs_mount *mp, + struct xfs_qoff_logitem *startqoff, + uint flags) { -xfs_trans_t *tp; -int error; -xfs_qoff_logitem_t *qoffi; + struct xfs_trans *tp; +int error;
You don't need the extra space before 'error'. The '*' is as much a part of the parameter as the name.
Quoted 29 lines
fs/xfs/xfs_qm_syscalls.c +7
-6+struct xfs_qoff_logitem *qoffi; error =xfs_trans_alloc (mp, &M_RES (mp)->tr_qm_equotaoff,0 ,0 ,0 , &tp);if (error)@@ -568,13 +571,13 @@ xfs_qm_log_quotaoff_end( STATIC intxfs_qm_log_quotaoff ( -xfs_mount_t *mp, -xfs_qoff_logitem_t **qoffstartp, -uint flags) +struct xfs_mount *mp, +struct xfs_qoff_logitem **qoffstartp, +uint flags) { -xfs_trans_t *tp; -int error; -xfs_qoff_logitem_t *qoffi; +struct xfs_trans *tp; +int error; +struct xfs_qoff_logitem *qoffi; *qoffstartp =NULL ;fs/xfs/xfs_trans_dquot.c +0
-0
fs/xfs/xfs_trans_dquot.c xfs_trans_reserve_quota_nblks( · line 829
Quoted 10 lines
fs/xfs/xfs_trans_dquot.c +2
-4@@ -824,13 +824,13 @@ xfs_trans_reserve_quota_nblks(/* * This routine is called to allocate a quotaoff log item. */ -xfs_qoff_logitem_t * +struct xfs_qoff_logitem * xfs_trans_get_qoff_item( -xfs_trans_t *tp, -xfs_qoff_logitem_t *startqoff, -uint flags) + struct xfs_trans *tp,
Er, please make these line up.
--D
Quoted 22 lines
fs/xfs/xfs_trans_dquot.c +5
-3+ struct xfs_qoff_logitem *startqoff, + uint flags) { -xfs_qoff_logitem_t *q; +struct xfs_qoff_logitem *q;ASSERT (tp !=NULL );@@ -852,8 +852,8 @@ xfs_trans_get_qoff_item(*/ void xfs_trans_log_quotaoff_item ( -xfs_trans_t *tp, -xfs_qoff_logitem_t *qlp) +struct xfs_trans *tp, +struct xfs_qoff_logitem *qlp) { tp->t_flags |=XFS_TRANS_DIRTY ;set_bit (XFS_LI_DIRTY , &qlp->qql_item.li_flags);Signature · 1 line
2.23.0