xfs: clean out XFS_LI_DIRTY setting boilerplate from ->iop_relog

Hoist this dirty flag setting to the ->iop_relog callsite to reduce
boilerplate.

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

diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 63b9960a96e1657a4af079cbeafdc5104f30145c..aa19ede91a57cac8b887a16f6ac4f7bbb571500e 100644 (file)
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -474,6 +474,8 @@ xfs_defer_relog(
        ASSERT((*tpp)->t_flags & XFS_TRANS_PERM_LOG_RES);
 
        list_for_each_entry(dfp, dfops, dfp_list) {
+               struct xfs_log_item     *lip;
+
                /*
                 * If the log intent item for this deferred op is not a part of
                 * the current log checkpoint, relog the intent item to keep
@@ -502,9 +504,12 @@ xfs_defer_relog(
                XFS_STATS_INC((*tpp)->t_mountp, defer_relog);
 
                xfs_defer_create_done(*tpp, dfp);
-               dfp->dfp_intent = xfs_trans_item_relog(dfp->dfp_intent,
-                               dfp->dfp_done, *tpp);
+               lip = xfs_trans_item_relog(dfp->dfp_intent, dfp->dfp_done,
+                               *tpp);
+               if (lip)
+                       set_bit(XFS_LI_DIRTY, &lip->li_flags);
                dfp->dfp_done = NULL;
+               dfp->dfp_intent = lip;
        }
 
        if ((*tpp)->t_flags & XFS_TRANS_DIRTY)

diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index e9813fa64461f466dc68ba5ac7b0954c5a07cd60..5d86a4b8b45785d3e1c00603bd71066d211c699d 100644 (file)
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -655,7 +655,6 @@ xfs_attri_item_relog(
        new_attrp->alfi_attr_filter = old_attrp->alfi_attr_filter;
 
        xfs_trans_add_item(tp, &new_attrip->attri_item);
-       set_bit(XFS_LI_DIRTY, &new_attrip->attri_item.li_flags);
 
        return &new_attrip->attri_item;
 }

diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index ba385c06de5d56b9b6349d49c84937848d528e86..ef72061d7cecc362a44199e5b676209434f441f1 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -586,7 +586,7 @@ xfs_bui_item_relog(
        memcpy(buip->bui_format.bui_extents, map, count * sizeof(*map));
        atomic_set(&buip->bui_next_extent, count);
        xfs_trans_add_item(tp, &buip->bui_item);
-       set_bit(XFS_LI_DIRTY, &buip->bui_item.li_flags);
+
        return &buip->bui_item;
 }
 

diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index 807398479187a2f4346c1ba6e6644e82833cf896..e2e86f2edb3c62eaf0cf2a4c0f3a04d25da34c2b 100644 (file)
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -709,7 +709,7 @@ xfs_efi_item_relog(
        memcpy(efip->efi_format.efi_extents, extp, count * sizeof(*extp));
        atomic_set(&efip->efi_next_extent, count);
        xfs_trans_add_item(tp, &efip->efi_item);
-       set_bit(XFS_LI_DIRTY, &efip->efi_item.li_flags);
+
        return &efip->efi_item;
 }
 

diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index 142839a8e7b1d785440d2b53fcd4362618d972cc..01d16e795068d67348ff6739c675cde10e327489 100644 (file)
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -547,7 +547,7 @@ xfs_cui_item_relog(
        memcpy(cuip->cui_format.cui_extents, pmap, count * sizeof(*pmap));
        atomic_set(&cuip->cui_next_extent, count);
        xfs_trans_add_item(tp, &cuip->cui_item);
-       set_bit(XFS_LI_DIRTY, &cuip->cui_item.li_flags);
+
        return &cuip->cui_item;
 }
 

diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
index e2730b3e0d960008719420d32d8f970f58b89659..96b2dc832d623910a16a6c0e81542ffa4f0a8a2e 100644 (file)
--- a/fs/xfs/xfs_rmap_item.c
+++ b/fs/xfs/xfs_rmap_item.c
@@ -600,7 +600,7 @@ xfs_rui_item_relog(
        memcpy(ruip->rui_format.rui_extents, map, count * sizeof(*map));
        atomic_set(&ruip->rui_next_extent, count);
        xfs_trans_add_item(tp, &ruip->rui_item);
-       set_bit(XFS_LI_DIRTY, &ruip->rui_item.li_flags);
+
        return &ruip->rui_item;
 }