xfs: convert "skip_discard" to a proper flags bitset

Source kernel commit: 980faece91a60c279e7c24cb1d1a378bbbb74bb9

Convert the boolean to skip discard on free into a proper flags field so
that we can add more flags in the next patch.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 47522d0fc11cf1782a36c5229d7922cb4ab0a627..ed9ac7f58d1aba7248e3d90e95eb2e9616c1bf48 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -1006,7 +1006,7 @@ xfs_ag_shrink_space(
                        goto resv_err;
 
                err2 = xfs_free_extent_later(*tpp, args.fsbno, delta, NULL,
-                               XFS_AG_RESV_NONE, true);
+                               XFS_AG_RESV_NONE, XFS_FREE_EXTENT_SKIP_DISCARD);
                if (err2)
                        goto resv_err;
 

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 48fdffd46d573ad8615b55d2078c48b8b31fdafe..6f792d280b3edbb0723844736ec6ea37f251e235 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2558,7 +2558,7 @@ xfs_defer_extent_free(
        xfs_filblks_t                   len,
        const struct xfs_owner_info     *oinfo,
        enum xfs_ag_resv_type           type,
-       bool                            skip_discard,
+       unsigned int                    free_flags,
        struct xfs_defer_pending        **dfpp)
 {
        struct xfs_extent_free_item     *xefi;
@@ -2578,6 +2578,7 @@ xfs_defer_extent_free(
        ASSERT(len < mp->m_sb.sb_agblocks);
        ASSERT(agbno + len <= mp->m_sb.sb_agblocks);
 #endif
+       ASSERT(!(free_flags & ~XFS_FREE_EXTENT_ALL_FLAGS));
        ASSERT(xfs_extfree_item_cache != NULL);
        ASSERT(type != XFS_AG_RESV_AGFL);
 
@@ -2589,7 +2590,7 @@ xfs_defer_extent_free(
        xefi->xefi_startblock = bno;
        xefi->xefi_blockcount = (xfs_extlen_t)len;
        xefi->xefi_agresv = type;
-       if (skip_discard)
+       if (free_flags & XFS_FREE_EXTENT_SKIP_DISCARD)
                xefi->xefi_flags |= XFS_EFI_SKIP_DISCARD;
        if (oinfo) {
                ASSERT(oinfo->oi_offset == 0);
@@ -2617,11 +2618,11 @@ xfs_free_extent_later(
        xfs_filblks_t                   len,
        const struct xfs_owner_info     *oinfo,
        enum xfs_ag_resv_type           type,
-       bool                            skip_discard)
+       unsigned int                    free_flags)
 {
        struct xfs_defer_pending        *dontcare = NULL;
 
-       return xfs_defer_extent_free(tp, bno, len, oinfo, type, skip_discard,
+       return xfs_defer_extent_free(tp, bno, len, oinfo, type, free_flags,
                        &dontcare);
 }
 
@@ -2646,13 +2647,13 @@ xfs_free_extent_later(
 int
 xfs_alloc_schedule_autoreap(
        const struct xfs_alloc_arg      *args,
-       bool                            skip_discard,
+       unsigned int                    free_flags,
        struct xfs_alloc_autoreap       *aarp)
 {
        int                             error;
 
        error = xfs_defer_extent_free(args->tp, args->fsbno, args->len,
-                       &args->oinfo, args->resv, skip_discard, &aarp->dfp);
+                       &args->oinfo, args->resv, free_flags, &aarp->dfp);
        if (error)
                return error;
 

diff --git a/libxfs/xfs_alloc.h b/libxfs/xfs_alloc.h
index 3dc8e44fea76b16d5c54677da7dbc1bd82c3df20..7f51b3cb03492cdbe757e0d26c7dc01d9c74665c 100644 (file)
--- a/libxfs/xfs_alloc.h
+++ b/libxfs/xfs_alloc.h
@@ -235,7 +235,12 @@ xfs_buf_to_agfl_bno(
 
 int xfs_free_extent_later(struct xfs_trans *tp, xfs_fsblock_t bno,
                xfs_filblks_t len, const struct xfs_owner_info *oinfo,
-               enum xfs_ag_resv_type type, bool skip_discard);
+               enum xfs_ag_resv_type type, unsigned int free_flags);
+
+/* Don't issue a discard for the blocks freed. */
+#define XFS_FREE_EXTENT_SKIP_DISCARD   (1U << 0)
+
+#define XFS_FREE_EXTENT_ALL_FLAGS      (XFS_FREE_EXTENT_SKIP_DISCARD)
 
 /*
  * List of extents to be free "later".
@@ -264,7 +269,7 @@ struct xfs_alloc_autoreap {
 };
 
 int xfs_alloc_schedule_autoreap(const struct xfs_alloc_arg *args,
-               bool skip_discard, struct xfs_alloc_autoreap *aarp);
+               unsigned int free_flags, struct xfs_alloc_autoreap *aarp);
 void xfs_alloc_cancel_autoreap(struct xfs_trans *tp,
                struct xfs_alloc_autoreap *aarp);
 void xfs_alloc_commit_autoreap(struct xfs_trans *tp,

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 5f4446104d8e48ae89c3ccb599c5b1b106a1f6f3..4b10f169f1eb941cfea336d63c9788bc4b90d2c9 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -599,7 +599,7 @@ xfs_bmap_btree_to_extents(
 
        xfs_rmap_ino_bmbt_owner(&oinfo, ip->i_ino, whichfork);
        error = xfs_free_extent_later(cur->bc_tp, cbno, 1, &oinfo,
-                       XFS_AG_RESV_NONE, false);
+                       XFS_AG_RESV_NONE, 0);
        if (error)
                return error;
 
@@ -5375,11 +5375,15 @@ xfs_bmap_del_extent_real(
                        error = xfs_rtfree_blocks(tp, del->br_startblock,
                                        del->br_blockcount);
                } else {
+                       unsigned int    efi_flags = 0;
+
+                       if ((bflags & XFS_BMAPI_NODISCARD) ||
+                           del->br_state == XFS_EXT_UNWRITTEN)
+                               efi_flags |= XFS_FREE_EXTENT_SKIP_DISCARD;
+
                        error = xfs_free_extent_later(tp, del->br_startblock,
                                        del->br_blockcount, NULL,
-                                       XFS_AG_RESV_NONE,
-                                       ((bflags & XFS_BMAPI_NODISCARD) ||
-                                       del->br_state == XFS_EXT_UNWRITTEN));
+                                       XFS_AG_RESV_NONE, efi_flags);
                }
                if (error)
                        return error;

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index 2a603b4d19bee0a227c5fdcef10ddf33aa74c5e7..a14ca35953d735276b54e3203baff0c35d2d50ff 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -281,7 +281,7 @@ xfs_bmbt_free_block(
 
        xfs_rmap_ino_bmbt_owner(&oinfo, ip->i_ino, cur->bc_ino.whichfork);
        error = xfs_free_extent_later(cur->bc_tp, fsbno, 1, &oinfo,
-                       XFS_AG_RESV_NONE, false);
+                       XFS_AG_RESV_NONE, 0);
        if (error)
                return error;
 

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index cef2819aa31677c25c776500143b04d6117eaace..c526f677e072b4b482547a15cf9a605d4a7e5bc3 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -1985,7 +1985,7 @@ xfs_difree_inode_chunk(
                return xfs_free_extent_later(tp,
                                XFS_AGB_TO_FSB(mp, agno, sagbno),
                                M_IGEO(mp)->ialloc_blks, &XFS_RMAP_OINFO_INODES,
-                               XFS_AG_RESV_NONE, false);
+                               XFS_AG_RESV_NONE, 0);
        }
 
        /* holemask is only 16-bits (fits in an unsigned long) */
@@ -2031,8 +2031,7 @@ xfs_difree_inode_chunk(
                ASSERT(contigblk % mp->m_sb.sb_spino_align == 0);
                error = xfs_free_extent_later(tp,
                                XFS_AGB_TO_FSB(mp, agno, agbno), contigblk,
-                               &XFS_RMAP_OINFO_INODES, XFS_AG_RESV_NONE,
-                               false);
+                               &XFS_RMAP_OINFO_INODES, XFS_AG_RESV_NONE, 0);
                if (error)
                        return error;
 

diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
index 5db9d0b33d66b47b8fad725b44b3d21032dc506a..5042cc62fc69da0d07b8e8cdacb7ab5b86ffae16 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -169,7 +169,7 @@ __xfs_inobt_free_block(
        xfs_inobt_mod_blockcount(cur, -1);
        fsbno = XFS_DADDR_TO_FSB(cur->bc_mp, xfs_buf_daddr(bp));
        return xfs_free_extent_later(cur->bc_tp, fsbno, 1,
-                       &XFS_RMAP_OINFO_INOBT, resv, false);
+                       &XFS_RMAP_OINFO_INOBT, resv, 0);
 }
 
 STATIC int

diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 47049488bb7b52fb765b8d4c811d415f965263cc..b4e6900be082fedfb1718e064982e3c6b7a1fa8d 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -1172,7 +1172,7 @@ xfs_refcount_adjust_extents(
                                                tmp.rc_startblock);
                                error = xfs_free_extent_later(cur->bc_tp, fsbno,
                                                  tmp.rc_blockcount, NULL,
-                                                 XFS_AG_RESV_NONE, false);
+                                                 XFS_AG_RESV_NONE, 0);
                                if (error)
                                        goto out_error;
                        }
@@ -1236,7 +1236,7 @@ xfs_refcount_adjust_extents(
                                        ext.rc_startblock);
                        error = xfs_free_extent_later(cur->bc_tp, fsbno,
                                        ext.rc_blockcount, NULL,
-                                       XFS_AG_RESV_NONE, false);
+                                       XFS_AG_RESV_NONE, 0);
                        if (error)
                                goto out_error;
                }
@@ -2021,7 +2021,7 @@ xfs_refcount_recover_cow_leftovers(
                /* Free the block. */
                error = xfs_free_extent_later(tp, fsb,
                                rr->rr_rrec.rc_blockcount, NULL,
-                               XFS_AG_RESV_NONE, false);
+                               XFS_AG_RESV_NONE, 0);
                if (error)
                        goto out_trans;
 

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index 362b2a2d733a3de055406a87faebcf0eaf53421a..162f9e6896a59035ddf3e827aa53b41e1a705c8c 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -108,7 +108,7 @@ xfs_refcountbt_free_block(
        be32_add_cpu(&agf->agf_refcount_blocks, -1);
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_REFCOUNT_BLOCKS);
        return xfs_free_extent_later(cur->bc_tp, fsbno, 1,
-                       &XFS_RMAP_OINFO_REFC, XFS_AG_RESV_METADATA, false);
+                       &XFS_RMAP_OINFO_REFC, XFS_AG_RESV_METADATA, 0);
 }
 
 STATIC int

diff --git a/repair/bulkload.c b/repair/bulkload.c
index d36e32d99adb6f3f92a3faf27a362424cda9d2f7..c96e569ef2979eb010c3463b90d31a6e1c749032 100644 (file)
--- a/repair/bulkload.c
+++ b/repair/bulkload.c
@@ -196,7 +196,8 @@ free:
         */
        fsbno = XFS_AGB_TO_FSB(sc->mp, resv->pag->pag_agno, free_agbno);
        error = -libxfs_free_extent_later(sc->tp, fsbno, free_aglen,
-                       &bkl->oinfo, XFS_AG_RESV_NONE, true);
+                       &bkl->oinfo, XFS_AG_RESV_NONE,
+                       XFS_FREE_EXTENT_SKIP_DISCARD);
        if (error)
                return error;