| Message ID | 20191112213310.212925-3-preichl@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | xfs: remove several typedefs in quota code | expand |
On Tue, Nov 12, 2019 at 10:33:07PM +0100, Pavel Reichl wrote: > Signed-off-by: Pavel Reichl <preichl@redhat.com> > Reviewed-by: Dave Chinner <dchinner@redhat.com> Looks fine, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_qm.c | 20 ++++++++++---------- > fs/xfs/xfs_qm.h | 6 +++--- > fs/xfs/xfs_trans_dquot.c | 2 +- > 3 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index 035930a4f0dd..64a944296fda 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -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 void > xfs_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 void > xfs_qm_destroy_quotainos( > - xfs_quotainfo_t *qi) > + struct xfs_quotainfo *qi) > { > if (qi->qi_uquotaip) { > xfs_irele(qi->qi_uquotaip); > diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h > index b41b75089548..7823af39008b 100644 > --- a/fs/xfs/xfs_qm.h > +++ b/fs/xfs/xfs_qm.h > @@ -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; > @@ -76,8 +76,8 @@ typedef struct xfs_quotainfo { > struct xfs_def_quota qi_usr_default; > struct xfs_def_quota qi_grp_default; > struct xfs_def_quota qi_prj_default; > - struct shrinker qi_shrinker; > -} xfs_quotainfo_t; > + struct shrinker qi_shrinker; > +}; > > static inline struct radix_tree_root * > xfs_dquot_tree( > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index 0b7f6f228662..d319347093d6 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -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 >
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 035930a4f0dd..64a944296fda 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -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 void xfs_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 void xfs_qm_destroy_quotainos( - xfs_quotainfo_t *qi) + struct xfs_quotainfo *qi) { if (qi->qi_uquotaip) { xfs_irele(qi->qi_uquotaip); diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h index b41b75089548..7823af39008b 100644 --- a/fs/xfs/xfs_qm.h +++ b/fs/xfs/xfs_qm.h @@ -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; @@ -76,8 +76,8 @@ typedef struct xfs_quotainfo { struct xfs_def_quota qi_usr_default; struct xfs_def_quota qi_grp_default; struct xfs_def_quota qi_prj_default; - struct shrinker qi_shrinker; -} xfs_quotainfo_t; + struct shrinker qi_shrinker; +}; static inline struct radix_tree_root * xfs_dquot_tree( diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index 0b7f6f228662..d319347093d6 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -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;