xfs: remove the xfs_qoff_logitem_t typedef

Signed-off-by: Pavel Reichl <preichl@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
[darrick: fix a comment]
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c
index fbdb3b89b703dce20f32b4ae2ecd50fa7cf158e1..c55cd9a3dec94ea749accd4a136b0e91703b2f11 100644 (file)
--- a/fs/xfs/libxfs/xfs_trans_resv.c
+++ b/fs/xfs/libxfs/xfs_trans_resv.c
@@ -742,7 +742,7 @@ xfs_calc_qm_dqalloc_reservation(
 
 /*
  * Turning off quotas.
- *    the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2
+ *    the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2
  *    the superblock for the quota flags: sector size
  */
 STATIC uint
@@ -755,7 +755,7 @@ xfs_calc_qm_quotaoff_reservation(
 
 /*
  * End of turning off quotas.
- *    the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2
+ *    the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2
  */
 STATIC uint
 xfs_calc_qm_quotaoff_end_reservation(void)

diff --git a/fs/xfs/xfs_dquot_item.h b/fs/xfs/xfs_dquot_item.h
index 3a64a7fd3b8a31e1a6f5a3a7d77ddbff7d97e64a..3bb19e556ade17e3832a6f9310e1feb6af30763c 100644 (file)
--- a/fs/xfs/xfs_dquot_item.h
+++ b/fs/xfs/xfs_dquot_item.h
@@ -12,24 +12,26 @@ struct xfs_mount;
 struct xfs_qoff_logitem;
 
 struct xfs_dq_logitem {
-       struct xfs_log_item      qli_item;      /* common portion */
+       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_lsn_t               qli_flush_lsn;  /* lsn at last flush */
 };
 
-typedef struct xfs_qoff_logitem {
-       struct xfs_log_item      qql_item;      /* common portion */
-       struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */
+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 void               xfs_trans_log_quotaoff_item(struct xfs_trans *,
-                                       struct xfs_qoff_logitem *);
+void xfs_qm_dquot_logitem_init(struct xfs_dquot *dqp);
+struct xfs_qoff_logitem        *xfs_qm_qoff_logitem_init(struct xfs_mount *mp,
+               struct xfs_qoff_logitem *start,
+               uint flags);
+struct xfs_qoff_logitem        *xfs_trans_get_qoff_item(struct xfs_trans *tp,
+               struct xfs_qoff_logitem *startqoff,
+               uint flags);
+void xfs_trans_log_quotaoff_item(struct xfs_trans *tp,
+               struct xfs_qoff_logitem *qlp);
 
 #endif /* __XFS_DQUOT_ITEM_H__ */

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index da7ad0383037bfb5994393c1f595bad55b1b6c0b..e685b9ae90b9735fa1e0f6e8efc7b8fdfcc9129c 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -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 @@ out_unlock:
 
 STATIC int
 xfs_qm_log_quotaoff_end(
-       xfs_mount_t             *mp,
-       xfs_qoff_logitem_t      *startqoff,
+       struct xfs_mount        *mp,
+       struct xfs_qoff_logitem *startqoff,
        uint                    flags)
 {
-       xfs_trans_t             *tp;
+       struct xfs_trans        *tp;
        int                     error;
-       xfs_qoff_logitem_t      *qoffi;
+       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 int
 xfs_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;
+       struct xfs_trans        *tp;
        int                     error;
-       xfs_qoff_logitem_t     *qoffi;
+       struct xfs_qoff_logitem *qoffi;
 
        *qoffstartp = NULL;
 

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index d319347093d6efa51f8d175418b412afafedcbbd..454fc83c588ad90c129d1b55e98bdba840d44dd4 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -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,
+       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);