diff mbox series

[v2,2/4] xfs: remove the xfs_quotainfo_t typedef

Message ID 20191108210612.423439-3-preichl@redhat.com (mailing list archive)
State Superseded
Headers show
Series xfs: remove several typedefs in quota code | expand

Commit Message

Pavel Reichl Nov. 8, 2019, 9:06 p.m. UTC 
Signed-off-by: Pavel Reichl <preichl@redhat.com>
---
 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(-)

Comments

Darrick J. Wong Nov. 8, 2019, 10:16 p.m. UTC | #1 
On Fri, Nov 08, 2019 at 10:06:10PM +0100, Pavel Reichl wrote:
> Signed-off-by: Pavel Reichl <preichl@redhat.com>
> ---
>  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(-)
> 
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index c11b3b1af8e9..92d8756b628e 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)

This indentation here   ^^^^^ should be tabs, not spaces.

>  {
> -	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
>  
>  	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..185c9d89a5cd 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;
> @@ -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(
> diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
> index ceb25d1cfdb1..4789f7e11f53 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
>
Pavel Reichl Nov. 11, 2019, 6:24 p.m. UTC | #2 
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


On Fri, Nov 8, 2019 at 11:18 PM Darrick J. Wong <darrick.wong@oracle.com> wrote:
>
> On Fri, Nov 08, 2019 at 10:06:10PM +0100, Pavel Reichl wrote:
> > Signed-off-by: Pavel Reichl <preichl@redhat.com>
> > ---
> >  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(-)
> >
> > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> > index c11b3b1af8e9..92d8756b628e 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)
>
> This indentation here   ^^^^^ should be tabs, not spaces.
>
> >  {
> > -     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
> >
> >       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..185c9d89a5cd 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;
> > @@ -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(
> > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
> > index ceb25d1cfdb1..4789f7e11f53 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 mbox series

Patch

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index c11b3b1af8e9..92d8756b628e 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..185c9d89a5cd 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;
@@ -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(
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index ceb25d1cfdb1..4789f7e11f53 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;