xfs: non-scrub - remove unused function parameters

Source kernel commit: a1f69417c6f4d1c5280ffb795da7778cba1e1451

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index d72701540baacf81ada7859319a8e087e4713b5e..bbb9f11e3b5eb2b5a1d68ffcec197f9f0bfd45ce 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -1943,7 +1943,7 @@ void
 xfs_alloc_compute_maxlevels(
        xfs_mount_t     *mp)    /* file system mount structure */
 {
-       mp->m_ag_maxlevels = xfs_btree_compute_maxlevels(mp, mp->m_alloc_mnr,
+       mp->m_ag_maxlevels = xfs_btree_compute_maxlevels(mp->m_alloc_mnr,
                        (mp->m_sb.sb_agblocks + 1) / 2);
 }
 
@@ -1955,7 +1955,6 @@ xfs_alloc_compute_maxlevels(
  */
 xfs_extlen_t
 xfs_alloc_longest_free_extent(
-       struct xfs_mount        *mp,
        struct xfs_perag        *pag,
        xfs_extlen_t            need,
        xfs_extlen_t            reserved)
@@ -2034,8 +2033,7 @@ xfs_alloc_space_available(
 
        /* do we have enough contiguous free space for the allocation? */
        alloc_len = args->minlen + (args->alignment - 1) + args->minalignslop;
-       longest = xfs_alloc_longest_free_extent(args->mp, pag, min_free,
-                       reservation);
+       longest = xfs_alloc_longest_free_extent(pag, min_free, reservation);
        if (longest < alloc_len)
                return false;
 

diff --git a/libxfs/xfs_alloc.h b/libxfs/xfs_alloc.h
index a311a2414a6b892467548664fe71b381d1a29da3..cbf789ea5a4e35749d55061ead620cf4a0c25738 100644 (file)
--- a/libxfs/xfs_alloc.h
+++ b/libxfs/xfs_alloc.h
@@ -116,9 +116,8 @@ xfs_alloc_allow_busy_reuse(int datatype)
 unsigned int xfs_alloc_set_aside(struct xfs_mount *mp);
 unsigned int xfs_alloc_ag_max_usable(struct xfs_mount *mp);
 
-xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_mount *mp,
-               struct xfs_perag *pag, xfs_extlen_t need,
-               xfs_extlen_t reserved);
+xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_perag *pag,
+               xfs_extlen_t need, xfs_extlen_t reserved);
 unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp,
                struct xfs_perag *pag);
 

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index e02fdd0d2f8050a69087a05a099ae2023b300425..cc1bcb16fd72911d035899ecd988ba999682f201 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -3216,7 +3216,7 @@ xfs_bmap_longest_free_extent(
                }
        }
 
-       longest = xfs_alloc_longest_free_extent(mp, pag,
+       longest = xfs_alloc_longest_free_extent(pag,
                                xfs_alloc_min_freelist(mp, pag),
                                xfs_ag_resv_needed(pag, XFS_AG_RESV_NONE));
        if (*blen < longest)
@@ -5658,7 +5658,6 @@ xfs_bmap_collapse_extents(
        xfs_fileoff_t           *next_fsb,
        xfs_fileoff_t           offset_shift_fsb,
        bool                    *done,
-       xfs_fileoff_t           stop_fsb,
        xfs_fsblock_t           *firstblock,
        struct xfs_defer_ops    *dfops)
 {

diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h
index f3be6416260bb79c005a57e0de5fdca7a750557c..2b766b37096d213e7170b34101210304606c2885 100644 (file)
--- a/libxfs/xfs_bmap.h
+++ b/libxfs/xfs_bmap.h
@@ -228,7 +228,7 @@ void        xfs_bmap_del_extent_cow(struct xfs_inode *ip,
 uint   xfs_default_attroffset(struct xfs_inode *ip);
 int    xfs_bmap_collapse_extents(struct xfs_trans *tp, struct xfs_inode *ip,
                xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,
-               bool *done, xfs_fileoff_t stop_fsb, xfs_fsblock_t *firstblock,
+               bool *done, xfs_fsblock_t *firstblock,
                struct xfs_defer_ops *dfops);
 int    xfs_bmap_insert_extents(struct xfs_trans *tp, struct xfs_inode *ip,
                xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index fcd244b4a323d423102393fe540f2512ae2f4d62..0ccf4f1d135858d53f12b11ad61d5fa45f194ab3 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -4531,7 +4531,6 @@ xfs_btree_sblock_verify(
  */
 uint
 xfs_btree_compute_maxlevels(
-       struct xfs_mount        *mp,
        uint                    *limits,
        unsigned long           len)
 {
@@ -4839,7 +4838,6 @@ xfs_btree_query_all(
  */
 xfs_extlen_t
 xfs_btree_calc_size(
-       struct xfs_mount        *mp,
        uint                    *limits,
        unsigned long long      len)
 {

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index c2c8b6cf9430c39e5c73e94efac95e1653b98be5..eb25d70e88416d4a41b044d9d8a5cbb0227a978c 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -481,10 +481,8 @@ xfs_failaddr_t xfs_btree_lblock_v5hdr_verify(struct xfs_buf *bp,
 xfs_failaddr_t xfs_btree_lblock_verify(struct xfs_buf *bp,
                unsigned int max_recs);
 
-uint xfs_btree_compute_maxlevels(struct xfs_mount *mp, uint *limits,
-                                unsigned long len);
-xfs_extlen_t xfs_btree_calc_size(struct xfs_mount *mp, uint *limits,
-               unsigned long long len);
+uint xfs_btree_compute_maxlevels(uint *limits, unsigned long len);
+xfs_extlen_t xfs_btree_calc_size(uint *limits, unsigned long long len);
 
 /* return codes */
 #define XFS_BTREE_QUERY_RANGE_CONTINUE 0       /* keep iterating */

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 4233d1ea86a31539a68a863d99641139c34c49ba..2dbba5f6e3e038bdca1f139adf9dbfea33997a9d 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -2400,7 +2400,7 @@ xfs_ialloc_compute_maxlevels(
        uint            inodes;
 
        inodes = (1LL << XFS_INO_AGINO_BITS(mp)) >> XFS_INODES_PER_CHUNK_LOG;
-       mp->m_in_maxlevels = xfs_btree_compute_maxlevels(mp, mp->m_inobt_mnr,
+       mp->m_in_maxlevels = xfs_btree_compute_maxlevels(mp->m_inobt_mnr,
                                                         inodes);
 }
 

diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
index 3bbb6ebe5778fa8116bd038b3b77d44328f42d64..8c467c9ee6b6729aa804b6b822d424aeca073944 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -555,7 +555,7 @@ xfs_inobt_max_size(
        if (mp->m_inobt_mxr[0] == 0)
                return 0;
 
-       return xfs_btree_calc_size(mp, mp->m_inobt_mnr,
+       return xfs_btree_calc_size(mp->m_inobt_mnr,
                (uint64_t)mp->m_sb.sb_agblocks * mp->m_sb.sb_inopblock /
                                XFS_INODES_PER_CHUNK);
 }

diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 24e68a1ddbf4303232fe0c7512588648fd282eb9..a19512ed3a05ea0306c5c30f4a37d7c5d2f80a8a 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -350,7 +350,6 @@ xfs_refcount_merge_center_extents(
        struct xfs_refcount_irec        *center,
        struct xfs_refcount_irec        *right,
        unsigned long long              extlen,
-       xfs_agblock_t                   *agbno,
        xfs_extlen_t                    *aglen)
 {
        int                             error;
@@ -470,7 +469,6 @@ xfs_refcount_merge_right_extent(
        struct xfs_btree_cur            *cur,
        struct xfs_refcount_irec        *right,
        struct xfs_refcount_irec        *cright,
-       xfs_agblock_t                   *agbno,
        xfs_extlen_t                    *aglen)
 {
        int                             error;
@@ -748,7 +746,7 @@ xfs_refcount_merge_extents(
            ulen < MAXREFCEXTLEN) {
                *shape_changed = true;
                return xfs_refcount_merge_center_extents(cur, &left, &cleft,
-                               &right, ulen, agbno, aglen);
+                               &right, ulen, aglen);
        }
 
        /* Try to merge left and cleft. */
@@ -777,7 +775,7 @@ xfs_refcount_merge_extents(
            ulen < MAXREFCEXTLEN) {
                *shape_changed = true;
                return xfs_refcount_merge_right_extent(cur, &right, &cright,
-                               agbno, aglen);
+                               aglen);
        }
 
        return error;
@@ -1355,9 +1353,7 @@ xfs_refcount_adjust_cow_extents(
        struct xfs_btree_cur    *cur,
        xfs_agblock_t           agbno,
        xfs_extlen_t            aglen,
-       enum xfs_refc_adjust_op adj,
-       struct xfs_defer_ops    *dfops,
-       struct xfs_owner_info   *oinfo)
+       enum xfs_refc_adjust_op adj)
 {
        struct xfs_refcount_irec        ext, tmp;
        int                             error;
@@ -1436,8 +1432,7 @@ xfs_refcount_adjust_cow(
        struct xfs_btree_cur    *cur,
        xfs_agblock_t           agbno,
        xfs_extlen_t            aglen,
-       enum xfs_refc_adjust_op adj,
-       struct xfs_defer_ops    *dfops)
+       enum xfs_refc_adjust_op adj)
 {
        bool                    shape_changed;
        int                     error;
@@ -1464,8 +1459,7 @@ xfs_refcount_adjust_cow(
                goto out_error;
 
        /* Now that we've taken care of the ends, adjust the middle extents */
-       error = xfs_refcount_adjust_cow_extents(cur, agbno, aglen, adj,
-                       dfops, NULL);
+       error = xfs_refcount_adjust_cow_extents(cur, agbno, aglen, adj);
        if (error)
                goto out_error;
 
@@ -1492,7 +1486,7 @@ __xfs_refcount_cow_alloc(
 
        /* Add refcount btree reservation */
        return xfs_refcount_adjust_cow(rcur, agbno, aglen,
-                       XFS_REFCOUNT_ADJUST_COW_ALLOC, dfops);
+                       XFS_REFCOUNT_ADJUST_COW_ALLOC);
 }
 
 /*
@@ -1510,7 +1504,7 @@ __xfs_refcount_cow_free(
 
        /* Remove refcount btree reservation */
        return xfs_refcount_adjust_cow(rcur, agbno, aglen,
-                       XFS_REFCOUNT_ADJUST_COW_FREE, dfops);
+                       XFS_REFCOUNT_ADJUST_COW_FREE);
 }
 
 /* Record a CoW staging extent in the refcount btree. */
@@ -1567,7 +1561,7 @@ struct xfs_refcount_recovery {
 /* Stuff an extent on the recovery list. */
 STATIC int
 xfs_refcount_recover_extent(
-       struct xfs_btree_cur            *cur,
+       struct xfs_btree_cur            *cur,
        union xfs_btree_rec             *rec,
        void                            *priv)
 {

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index b111b1f4f80ec6b86b5f513f08b0f99bfbf9ad8c..167b1fd1159ae5bedb30fb7aed91c356d86b5756 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -372,7 +372,6 @@ xfs_refcountbt_init_cursor(
  */
 int
 xfs_refcountbt_maxrecs(
-       struct xfs_mount        *mp,
        int                     blocklen,
        bool                    leaf)
 {
@@ -389,7 +388,7 @@ void
 xfs_refcountbt_compute_maxlevels(
        struct xfs_mount                *mp)
 {
-       mp->m_refc_maxlevels = xfs_btree_compute_maxlevels(mp,
+       mp->m_refc_maxlevels = xfs_btree_compute_maxlevels(
                        mp->m_refc_mnr, mp->m_sb.sb_agblocks);
 }
 
@@ -399,7 +398,7 @@ xfs_refcountbt_calc_size(
        struct xfs_mount        *mp,
        unsigned long long      len)
 {
-       return xfs_btree_calc_size(mp, mp->m_refc_mnr, len);
+       return xfs_btree_calc_size(mp->m_refc_mnr, len);
 }
 
 /*

diff --git a/libxfs/xfs_refcount_btree.h b/libxfs/xfs_refcount_btree.h
index 9db008b955b7ed68bb62d8654073da0302668171..2bc4694ef146ec7c141c1a07ffe20c1e85538a71 100644 (file)
--- a/libxfs/xfs_refcount_btree.h
+++ b/libxfs/xfs_refcount_btree.h
@@ -60,8 +60,7 @@ struct xfs_mount;
 extern struct xfs_btree_cur *xfs_refcountbt_init_cursor(struct xfs_mount *mp,
                struct xfs_trans *tp, struct xfs_buf *agbp, xfs_agnumber_t agno,
                struct xfs_defer_ops *dfops);
-extern int xfs_refcountbt_maxrecs(struct xfs_mount *mp, int blocklen,
-               bool leaf);
+extern int xfs_refcountbt_maxrecs(int blocklen, bool leaf);
 extern void xfs_refcountbt_compute_maxlevels(struct xfs_mount *mp);
 
 extern xfs_extlen_t xfs_refcountbt_calc_size(struct xfs_mount *mp,

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index 9a5b07fa879906465e845c6660566d68c560c100..09f74a5f48a5769f9cf7eeb0492ddb4df83c134f 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -374,7 +374,6 @@ xfs_rmap_free_check_owner(
        struct xfs_mount        *mp,
        uint64_t                ltoff,
        struct xfs_rmap_irec    *rec,
-       xfs_fsblock_t           bno,
        xfs_filblks_t           len,
        uint64_t                owner,
        uint64_t                offset,
@@ -517,7 +516,7 @@ xfs_rmap_unmap(
                        bno + len, out_error);
 
        /* Check owner information. */
-       error = xfs_rmap_free_check_owner(mp, ltoff, &ltrec, bno, len, owner,
+       error = xfs_rmap_free_check_owner(mp, ltoff, &ltrec, len, owner,
                        offset, flags);
        if (error)
                goto out_error;

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index fe81cda20ddcad33468e9cf71dd600c3c92303ba..b30b9307ec3ae84db96c94c0f4663e69cf7c8cbb 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -497,7 +497,6 @@ xfs_rmapbt_init_cursor(
  */
 int
 xfs_rmapbt_maxrecs(
-       struct xfs_mount        *mp,
        int                     blocklen,
        int                     leaf)
 {
@@ -532,7 +531,7 @@ xfs_rmapbt_compute_maxlevels(
        if (xfs_sb_version_hasreflink(&mp->m_sb))
                mp->m_rmap_maxlevels = XFS_BTREE_MAXLEVELS;
        else
-               mp->m_rmap_maxlevels = xfs_btree_compute_maxlevels(mp,
+               mp->m_rmap_maxlevels = xfs_btree_compute_maxlevels(
                                mp->m_rmap_mnr, mp->m_sb.sb_agblocks);
 }
 
@@ -542,7 +541,7 @@ xfs_rmapbt_calc_size(
        struct xfs_mount        *mp,
        unsigned long long      len)
 {
-       return xfs_btree_calc_size(mp, mp->m_rmap_mnr, len);
+       return xfs_btree_calc_size(mp->m_rmap_mnr, len);
 }
 
 /*

diff --git a/libxfs/xfs_rmap_btree.h b/libxfs/xfs_rmap_btree.h
index 6b8edcf2ca16eda1384a02c0639c88a43eb90579..6f72c1de17a1b665006dd13f11be1d13465d8fb1 100644 (file)
--- a/libxfs/xfs_rmap_btree.h
+++ b/libxfs/xfs_rmap_btree.h
@@ -55,7 +55,7 @@ struct xfs_mount;
 struct xfs_btree_cur *xfs_rmapbt_init_cursor(struct xfs_mount *mp,
                                struct xfs_trans *tp, struct xfs_buf *bp,
                                xfs_agnumber_t agno);
-int xfs_rmapbt_maxrecs(struct xfs_mount *mp, int blocklen, int leaf);
+int xfs_rmapbt_maxrecs(int blocklen, int leaf);
 extern void xfs_rmapbt_compute_maxlevels(struct xfs_mount *mp);
 
 extern xfs_extlen_t xfs_rmapbt_calc_size(struct xfs_mount *mp,

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index 24c981befe95736c34c0f4bf71b9410ad5c3c9c7..20314c18112c26e9c9584468d649e38d1c731281 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -738,15 +738,13 @@ xfs_sb_mount_common(
        mp->m_bmap_dmnr[0] = mp->m_bmap_dmxr[0] / 2;
        mp->m_bmap_dmnr[1] = mp->m_bmap_dmxr[1] / 2;
 
-       mp->m_rmap_mxr[0] = xfs_rmapbt_maxrecs(mp, sbp->sb_blocksize, 1);
-       mp->m_rmap_mxr[1] = xfs_rmapbt_maxrecs(mp, sbp->sb_blocksize, 0);
+       mp->m_rmap_mxr[0] = xfs_rmapbt_maxrecs(sbp->sb_blocksize, 1);
+       mp->m_rmap_mxr[1] = xfs_rmapbt_maxrecs(sbp->sb_blocksize, 0);
        mp->m_rmap_mnr[0] = mp->m_rmap_mxr[0] / 2;
        mp->m_rmap_mnr[1] = mp->m_rmap_mxr[1] / 2;
 
-       mp->m_refc_mxr[0] = xfs_refcountbt_maxrecs(mp, sbp->sb_blocksize,
-                       true);
-       mp->m_refc_mxr[1] = xfs_refcountbt_maxrecs(mp, sbp->sb_blocksize,
-                       false);
+       mp->m_refc_mxr[0] = xfs_refcountbt_maxrecs(sbp->sb_blocksize, true);
+       mp->m_refc_mxr[1] = xfs_refcountbt_maxrecs(sbp->sb_blocksize, false);
        mp->m_refc_mnr[0] = mp->m_refc_mxr[0] / 2;
        mp->m_refc_mnr[1] = mp->m_refc_mxr[1] / 2;
 

diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c
index 3cebb90d274560ed91669f34160cc8c3efbd2fbc..f97fdb439d4f0b3cd4581d04ba48bbb7a9d0a8bf 100644 (file)
--- a/libxfs/xfs_trans_resv.c
+++ b/libxfs/xfs_trans_resv.c
@@ -733,8 +733,7 @@ xfs_calc_clear_agi_bucket_reservation(
  *    the xfs_disk_dquot_t: sizeof(struct xfs_disk_dquot)
  */
 STATIC uint
-xfs_calc_qm_setqlim_reservation(
-       struct xfs_mount        *mp)
+xfs_calc_qm_setqlim_reservation(void)
 {
        return xfs_calc_buf_res(1, sizeof(struct xfs_disk_dquot));
 }
@@ -771,8 +770,7 @@ xfs_calc_qm_quotaoff_reservation(
  *    the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2
  */
 STATIC uint
-xfs_calc_qm_quotaoff_end_reservation(
-       struct xfs_mount        *mp)
+xfs_calc_qm_quotaoff_end_reservation(void)
 {
        return sizeof(struct xfs_qoff_logitem) * 2;
 }
@@ -876,14 +874,14 @@ xfs_trans_resv_calc(
         * The following transactions are logged in logical format with
         * a default log count.
         */
-       resp->tr_qm_setqlim.tr_logres = xfs_calc_qm_setqlim_reservation(mp);
+       resp->tr_qm_setqlim.tr_logres = xfs_calc_qm_setqlim_reservation();
        resp->tr_qm_setqlim.tr_logcount = XFS_DEFAULT_LOG_COUNT;
 
        resp->tr_qm_quotaoff.tr_logres = xfs_calc_qm_quotaoff_reservation(mp);
        resp->tr_qm_quotaoff.tr_logcount = XFS_DEFAULT_LOG_COUNT;
 
        resp->tr_qm_equotaoff.tr_logres =
-               xfs_calc_qm_quotaoff_end_reservation(mp);
+               xfs_calc_qm_quotaoff_end_reservation();
        resp->tr_qm_equotaoff.tr_logcount = XFS_DEFAULT_LOG_COUNT;
 
        resp->tr_sb.tr_logres = xfs_calc_sb_reservation(mp);