Commit 901219bb authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent b80b29d6

fs/xfs/xfs_log_recover.c

+3 −5
Original line number Diff line number Diff line
@@ -2539,11 +2539,9 @@ xlog_recover_process_intents( 
		 * this routine or else those subsequent intents will get

		 * replayed in the wrong order!

		 */

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

		}

		if (error)

			goto out;

		lip = xfs_trans_ail_cursor_next(ailp, &cur);

fs/xfs/xfs_trans.h

+1 −3
Original line number Diff line number Diff line
@@ -55,14 +55,12 @@ struct xfs_log_item { 
#define	XFS_LI_ABORTED	1

#define	XFS_LI_FAILED	2

#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 \

	{ (1 << XFS_LI_IN_AIL),		"IN_AIL" }, \

	{ (1 << XFS_LI_ABORTED),	"ABORTED" }, \

	{ (1 << XFS_LI_FAILED),		"FAILED" }, \

	{ (1 << XFS_LI_DIRTY),		"DIRTY" }, \

	{ (1 << XFS_LI_RECOVERED),	"RECOVERED" }

	{ (1 << XFS_LI_DIRTY),		"DIRTY" }



struct xfs_item_ops {

	unsigned flags;

CRA Git | Maintained and supported by SUSTech CRA and CCSE