xfs: remove xfs_perag_t

Almost unused, gets rid of another typedef.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c
index 0e0819f..29c4269 100644 (file)
--- a/fs/xfs/libxfs/xfs_ag.c
+++ b/fs/xfs/libxfs/xfs_ag.c
@@ -104,19 +104,19 @@ xfs_perag_put(
  */
 int
 xfs_initialize_perag_data(
-       struct xfs_mount *mp,
-       xfs_agnumber_t  agcount)
+       struct xfs_mount        *mp,
+       xfs_agnumber_t          agcount)
 {
-       xfs_agnumber_t  index;
-       xfs_perag_t     *pag;
-       xfs_sb_t        *sbp = &mp->m_sb;
-       uint64_t        ifree = 0;
-       uint64_t        ialloc = 0;
-       uint64_t        bfree = 0;
-       uint64_t        bfreelst = 0;
-       uint64_t        btree = 0;
-       uint64_t        fdblocks;
-       int             error = 0;
+       xfs_agnumber_t          index;
+       struct xfs_perag        *pag;
+       struct xfs_sb           *sbp = &mp->m_sb;
+       uint64_t                ifree = 0;
+       uint64_t                ialloc = 0;
+       uint64_t                bfree = 0;
+       uint64_t                bfreelst = 0;
+       uint64_t                btree = 0;
+       uint64_t                fdblocks;
+       int                     error = 0;
 
        for (index = 0; index < agcount; index++) {
                /*

diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h
index ebf997a..6006b43 100644 (file)
--- a/fs/xfs/libxfs/xfs_ag.h
+++ b/fs/xfs/libxfs/xfs_ag.h
@@ -29,7 +29,7 @@ struct xfs_ag_resv {
  * Per-ag incore structure, copies of information in agf and agi, to improve the
  * performance of allocation group selection.
  */
-typedef struct xfs_perag {
+struct xfs_perag {
        struct xfs_mount *pag_mount;    /* owner filesystem */
        xfs_agnumber_t  pag_agno;       /* AG this structure belongs to */
        atomic_t        pag_ref;        /* perag reference count */
@@ -102,7 +102,7 @@ typedef struct xfs_perag {
         * or have some other means to control concurrency.
         */
        struct rhashtable       pagi_unlinked_hash;
-} xfs_perag_t;
+};
 
 int xfs_initialize_perag(struct xfs_mount *mp, xfs_agnumber_t agcount,
                        xfs_agnumber_t *maxagi);

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index f7864f3..00bb342 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2694,21 +2694,21 @@ out_no_agbp:
  * Get a block from the freelist.
  * Returns with the buffer for the block gotten.
  */
-int                            /* error */
+int
 xfs_alloc_get_freelist(
-       xfs_trans_t     *tp,    /* transaction pointer */
-       struct xfs_buf  *agbp,  /* buffer containing the agf structure */
-       xfs_agblock_t   *bnop,  /* block address retrieved from freelist */
-       int             btreeblk) /* destination is a AGF btree */
+       struct xfs_trans        *tp,
+       struct xfs_buf          *agbp,
+       xfs_agblock_t           *bnop,
+       int                     btreeblk)
 {
-       struct xfs_agf  *agf = agbp->b_addr;
-       struct xfs_buf  *agflbp;/* buffer for a.g. freelist structure */
-       xfs_agblock_t   bno;    /* block number returned */
-       __be32          *agfl_bno;
-       int             error;
-       int             logflags;
-       xfs_mount_t     *mp = tp->t_mountp;
-       xfs_perag_t     *pag;   /* per allocation group data */
+       struct xfs_agf          *agf = agbp->b_addr;
+       struct xfs_buf          *agflbp;
+       xfs_agblock_t           bno;
+       __be32                  *agfl_bno;
+       int                     error;
+       int                     logflags;
+       struct xfs_mount        *mp = tp->t_mountp;
+       struct xfs_perag        *pag;
 
        /*
         * Freelist is empty, give up.
@@ -2818,20 +2818,20 @@ xfs_alloc_pagf_init(
 /*
  * Put the block on the freelist for the allocation group.
  */
-int                                    /* error */
+int
 xfs_alloc_put_freelist(
-       xfs_trans_t             *tp,    /* transaction pointer */
-       struct xfs_buf          *agbp,  /* buffer for a.g. freelist header */
-       struct xfs_buf          *agflbp,/* buffer for a.g. free block array */
-       xfs_agblock_t           bno,    /* block being freed */
-       int                     btreeblk) /* block came from a AGF btree */
+       struct xfs_trans        *tp,
+       struct xfs_buf          *agbp,
+       struct xfs_buf          *agflbp,
+       xfs_agblock_t           bno,
+       int                     btreeblk)
 {
        struct xfs_mount        *mp = tp->t_mountp;
        struct xfs_agf          *agf = agbp->b_addr;
-       __be32                  *blockp;/* pointer to array entry */
+       struct xfs_perag        *pag;
+       __be32                  *blockp;
        int                     error;
        int                     logflags;
-       xfs_perag_t             *pag;   /* per allocation group data */
        __be32                  *agfl_bno;
        int                     startoff;