提交 901219bb 编写于 作者: D Darrick J. Wong

xfs: remove XFS_LI_RECOVERED

The ->iop_recover method of a log intent item removes the recovered
intent item from the AIL by logging an intent done item and committing
the transaction, so it's superfluous to have this flag check.  Nothing
else uses it, so get rid of the flag entirely.
Signed-off-by: NDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: NBrian Foster <bfoster@redhat.com>
Reviewed-by: NChristoph Hellwig <hch@lst.de>
上级 b80b29d6
...@@ -2539,11 +2539,9 @@ xlog_recover_process_intents( ...@@ -2539,11 +2539,9 @@ xlog_recover_process_intents(
* this routine or else those subsequent intents will get * this routine or else those subsequent intents will get
* replayed in the wrong order! * replayed in the wrong order!
*/ */
if (!test_and_set_bit(XFS_LI_RECOVERED, &lip->li_flags)) { spin_unlock(&ailp->ail_lock);
spin_unlock(&ailp->ail_lock); error = lip->li_ops->iop_recover(lip, parent_tp);
error = lip->li_ops->iop_recover(lip, parent_tp); spin_lock(&ailp->ail_lock);
spin_lock(&ailp->ail_lock);
}
if (error) if (error)
goto out; goto out;
lip = xfs_trans_ail_cursor_next(ailp, &cur); lip = xfs_trans_ail_cursor_next(ailp, &cur);
......
...@@ -55,14 +55,12 @@ struct xfs_log_item { ...@@ -55,14 +55,12 @@ struct xfs_log_item {
#define XFS_LI_ABORTED 1 #define XFS_LI_ABORTED 1
#define XFS_LI_FAILED 2 #define XFS_LI_FAILED 2
#define XFS_LI_DIRTY 3 /* log item dirty in transaction */ #define XFS_LI_DIRTY 3 /* log item dirty in transaction */
#define XFS_LI_RECOVERED 4 /* log intent item has been recovered */
#define XFS_LI_FLAGS \ #define XFS_LI_FLAGS \
{ (1 << XFS_LI_IN_AIL), "IN_AIL" }, \ { (1 << XFS_LI_IN_AIL), "IN_AIL" }, \
{ (1 << XFS_LI_ABORTED), "ABORTED" }, \ { (1 << XFS_LI_ABORTED), "ABORTED" }, \
{ (1 << XFS_LI_FAILED), "FAILED" }, \ { (1 << XFS_LI_FAILED), "FAILED" }, \
{ (1 << XFS_LI_DIRTY), "DIRTY" }, \ { (1 << XFS_LI_DIRTY), "DIRTY" }
{ (1 << XFS_LI_RECOVERED), "RECOVERED" }
struct xfs_item_ops { struct xfs_item_ops {
unsigned flags; unsigned flags;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册