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>
This commit is contained in:
Darrick J. Wong
2020-05-01 16:00:55 -07:00
parent 96b60f8267
commit cc560a5a95
5 changed files with 2 additions and 19 deletions

View File

@@ -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;