From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21178C43331 for ; Thu, 7 Nov 2019 22:32:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5B202067B for ; Thu, 7 Nov 2019 22:32:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="CmNHd69F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726281AbfKGWcE (ORCPT ); Thu, 7 Nov 2019 17:32:04 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:43464 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725906AbfKGWcD (ORCPT ); Thu, 7 Nov 2019 17:32:03 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xA7MT135064077; Thu, 7 Nov 2019 22:31:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2019-08-05; bh=6/S4gp4MNS2mqCNHj/h++12oNTu/77C7KBORvFWj6h4=; b=CmNHd69FtZB0c93uk0RBao8vgPOxUzBEVZ3Gi4Id7M4NcwXiOWd3qONMft+U/4SJh4uW iHDM8YBo2MundZhpJGR49P5yupjmbsZVKLjOQiOAk1V/8pKs7eJiR0URqDmbJAgDMlaq Klv4hX+APFmZwMjUkN96blzjy83WjvQmuUVgG4dqrF48P02rMYBtu+H+7ANq2TMMZfBV d4aq8LTIrsQLkrHJJaSR32RQl6PVytFSjckQcY8nJ1S5FUiHoGTG8iQ6KmEx/YSWiQWm Dj5Osr2hQ8mvEyQneIZJnAakwlXTCwSvZwNWknZLzfy3OXKRxcQMliriB322T5iDcPX5 HA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 2w41w11ehc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Nov 2019 22:31:57 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xA7MSj7A029599; Thu, 7 Nov 2019 22:31:57 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 2w41wg1jdb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Nov 2019 22:31:57 +0000 Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id xA7MVukj014279; Thu, 7 Nov 2019 22:31:56 GMT Received: from localhost (/10.145.179.16) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 07 Nov 2019 14:31:56 -0800 Date: Thu, 7 Nov 2019 14:31:55 -0800 From: "Darrick J. Wong" To: Pavel Reichl Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH 2/5] xfs: remove the xfs_dquot_t typedef Message-ID: <20191107223155.GJ6219@magnolia> References: <20191107113549.110129-1-preichl@redhat.com> <20191107113549.110129-3-preichl@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191107113549.110129-3-preichl@redhat.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9434 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1910280000 definitions=main-1911070205 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9434 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1910280000 definitions=main-1911070205 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thu, Nov 07, 2019 at 12:35:46PM +0100, Pavel Reichl wrote: > Signed-off-by: Pavel Reichl > --- > 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 >