From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Pavel Reichl <preichl@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/5] xfs: remove the xfs_dquot_t typedef
Date: Thu, 7 Nov 2019 14:31:55 -0800 [thread overview]
Message-ID: <20191107223155.GJ6219@magnolia> (raw)
In-Reply-To: <20191107113549.110129-3-preichl@redhat.com>
On Thu, Nov 07, 2019 at 12:35:46PM +0100, Pavel Reichl wrote:
> Signed-off-by: Pavel Reichl <preichl@redhat.com>
> ---
> fs/xfs/xfs_dquot.c | 6 +++---
> fs/xfs/xfs_dquot.h | 21 +++++++++++----------
> fs/xfs/xfs_qm.c | 28 ++++++++++++++--------------
> fs/xfs/xfs_qm_bhv.c | 2 +-
> fs/xfs/xfs_trans_dquot.c | 38 +++++++++++++++++++-------------------
> 5 files changed, 48 insertions(+), 47 deletions(-)
>
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index edf0e81b3a10..04e38ed97f5f 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -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;
>
> /*
> @@ -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);
> diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
> index 7a580dd09a76..330ba888e74a 100644
> --- a/fs/xfs/xfs_dquot.h
> +++ b/fs/xfs/xfs_dquot.h
> @@ -30,7 +30,7 @@ enum {
> /*
> * The incore dquot structure
> */
> -typedef struct xfs_dquot {
> +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 */
> @@ -51,7 +51,7 @@ typedef struct xfs_dquot {
> struct completion q_flush; /* flush completion queue */
> 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:
> @@ -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,9 +147,10 @@ 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_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 *,
> struct xfs_disk_dquot *);
> extern void xfs_qm_adjust_dqlimits(struct xfs_mount *,
> @@ -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 *);
>
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index ecd8ce152ab1..a8b278348f5a 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -243,14 +243,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,
Same general "kill the other typedefs when you touch a clump of them" (and
our national nightmare will slowly go away) here. :)
Otherwise looks reasonable.
--D
> + 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;
> @@ -543,7 +543,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;
> @@ -1737,14 +1737,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;
>
> diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c
> index 5d72e88598b4..1830f52d5975 100644
> --- a/fs/xfs/xfs_qm_bhv.c
> +++ b/fs/xfs/xfs_qm_bhv.c
> @@ -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);
> diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
> index 16457465833b..ceb25d1cfdb1 100644
> --- a/fs/xfs/xfs_trans_dquot.c
> +++ b/fs/xfs/xfs_trans_dquot.c
> @@ -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 int
> xfs_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;
>
>
> --
> 2.23.0
>
next prev parent reply other threads:[~2019-11-07 22:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 11:35 [PATCH 0/5] xfs: remove several typedefs in quota code Pavel Reichl
2019-11-07 11:35 ` [PATCH 1/5] xfs: remove the xfs_disk_dquot_t typedef Pavel Reichl
2019-11-07 22:02 ` Darrick J. Wong
2019-11-07 11:35 ` [PATCH 2/5] xfs: remove the xfs_dquot_t typedef Pavel Reichl
2019-11-07 22:31 ` Darrick J. Wong [this message]
2019-11-07 11:35 ` [PATCH 3/5] xfs: remove the xfs_quotainfo_t typedef Pavel Reichl
2019-11-08 0:19 ` Darrick J. Wong
2019-11-07 11:35 ` [PATCH 4/5] xfs: remove the xfs_dq_logitem_t typedef Pavel Reichl
2019-11-08 0:20 ` Darrick J. Wong
2019-11-07 11:35 ` [PATCH 5/5] xfs: remove the xfs_qoff_logitem_t typedef Pavel Reichl
2019-11-08 0:20 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191107223155.GJ6219@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=preichl@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.