xfs: hoist setting of XFS_LI_RECOVERED to caller

The only purpose of XFS_LI_RECOVERED is to prevent log recovery from
trying to replay recovered intents more than once.  Therefore, we can
move the bit setting up to the ->iop_recover caller.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index 3b8ca44..6736c5a 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -442,11 +442,8 @@ xfs_bui_item_recover(
        int                             whichfork;
        int                             error = 0;
 
-       ASSERT(!test_bit(XFS_LI_RECOVERED, &buip->bui_item.li_flags));
-
        /* Only one mapping operation per BUI... */
        if (buip->bui_format.bui_nextents != XFS_BUI_MAX_FAST_EXTENTS) {
-               set_bit(XFS_LI_RECOVERED, &buip->bui_item.li_flags);
                xfs_bui_release(buip);
                return -EFSCORRUPTED;
        }
@@ -480,7 +477,6 @@ xfs_bui_item_recover(
                 * This will pull the BUI from the AIL and
                 * free the memory associated with it.
                 */
-               set_bit(XFS_LI_RECOVERED, &buip->bui_item.li_flags);
                xfs_bui_release(buip);
                return -EFSCORRUPTED;
        }
@@ -538,7 +534,6 @@ xfs_bui_item_recover(
                xfs_bmap_unmap_extent(tp, ip, &irec);
        }
 
-       set_bit(XFS_LI_RECOVERED, &buip->bui_item.li_flags);
        xfs_defer_move(parent_tp, tp);
        error = xfs_trans_commit(tp);
        xfs_iunlock(ip, XFS_ILOCK_EXCL);

diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index a8ee9aa..b9c333b 100644 (file)
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -594,8 +594,6 @@ xfs_efi_item_recover(
        int                             i;
        int                             error = 0;
 
-       ASSERT(!test_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags));
-
        /*
         * First check the validity of the extents described by the
         * EFI.  If any are bad, then assume that all are bad and
@@ -613,7 +611,6 @@ xfs_efi_item_recover(
                         * This will pull the EFI from the AIL and
                         * free the memory associated with it.
                         */
-                       set_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags);
                        xfs_efi_release(efip);
                        return -EFSCORRUPTED;
                }
@@ -634,7 +631,6 @@ xfs_efi_item_recover(
 
        }
 
-       set_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags);
        error = xfs_trans_commit(tp);
        return error;
 

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 60e98e4..fa1b63b 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2643,7 +2643,7 @@ xlog_recover_process_intents(
        struct xfs_ail_cursor   cur;
        struct xfs_log_item     *lip;
        struct xfs_ail          *ailp;
-       int                     error = 0;
+       int                     error;
 #if defined(DEBUG) || defined(XFS_WARN)
        xfs_lsn_t               last_lsn;
 #endif
@@ -2693,7 +2693,7 @@ xlog_recover_process_intents(
                 * this routine or else those subsequent intents will get
                 * replayed in the wrong order!
                 */
-               if (!test_bit(XFS_LI_RECOVERED, &lip->li_flags)) {
+               if (!test_and_set_bit(XFS_LI_RECOVERED, &lip->li_flags)) {
                        spin_unlock(&ailp->ail_lock);
                        error = lip->li_ops->iop_recover(lip, parent_tp);
                        spin_lock(&ailp->ail_lock);

diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index b256eaf..c816398 100644 (file)
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -442,8 +442,6 @@ xfs_cui_item_recover(
        int                             i;
        int                             error = 0;
 
-       ASSERT(!test_bit(XFS_LI_RECOVERED, &cuip->cui_item.li_flags));
-
        /*
         * First check the validity of the extents described by the
         * CUI.  If any are bad, then assume that all are bad and
@@ -473,7 +471,6 @@ xfs_cui_item_recover(
                         * This will pull the CUI from the AIL and
                         * free the memory associated with it.
                         */
-                       set_bit(XFS_LI_RECOVERED, &cuip->cui_item.li_flags);
                        xfs_cui_release(cuip);
                        return -EFSCORRUPTED;
                }
@@ -557,7 +554,6 @@ xfs_cui_item_recover(
        }
 
        xfs_refcount_finish_one_cleanup(tp, rcur, error);
-       set_bit(XFS_LI_RECOVERED, &cuip->cui_item.li_flags);
        xfs_defer_move(parent_tp, tp);
        error = xfs_trans_commit(tp);
        return error;

diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
index d190060..a86599d 100644 (file)
--- a/fs/xfs/xfs_rmap_item.c
+++ b/fs/xfs/xfs_rmap_item.c
@@ -482,8 +482,6 @@ xfs_rui_item_recover(
        int                             whichfork;
        int                             error = 0;
 
-       ASSERT(!test_bit(XFS_LI_RECOVERED, &ruip->rui_item.li_flags));
-
        /*
         * First check the validity of the extents described by the
         * RUI.  If any are bad, then assume that all are bad and
@@ -517,7 +515,6 @@ xfs_rui_item_recover(
                         * This will pull the RUI from the AIL and
                         * free the memory associated with it.
                         */
-                       set_bit(XFS_LI_RECOVERED, &ruip->rui_item.li_flags);
                        xfs_rui_release(ruip);
                        return -EFSCORRUPTED;
                }
@@ -575,7 +572,6 @@ xfs_rui_item_recover(
        }
 
        xfs_rmap_finish_one_cleanup(tp, rcur, error);
-       set_bit(XFS_LI_RECOVERED, &ruip->rui_item.li_flags);
        error = xfs_trans_commit(tp);
        return error;