Commit 889eb55d authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: refactor intent item RECOVERED flag into the log item 



Rename XFS_{EFI,BUI,RUI,CUI}_RECOVERED to XFS_LI_RECOVERED so that we
track recovery status in the log item, then get rid of the now unused
flags fields in each of those log item types.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 86a37174

fs/xfs/xfs_bmap_item.c

+5 −5
Original line number Diff line number Diff line
@@ -441,11 +441,11 @@ xfs_bui_recover( 
	struct xfs_bmbt_irec		irec;

	struct xfs_mount		*mp = parent_tp->t_mountp;



	ASSERT(!test_bit(XFS_BUI_RECOVERED, &buip->bui_flags));

	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_BUI_RECOVERED, &buip->bui_flags);

		set_bit(XFS_LI_RECOVERED, &buip->bui_item.li_flags);

		xfs_bui_release(buip);

		return -EFSCORRUPTED;

	}
@@ -479,7 +479,7 @@ xfs_bui_recover( 
		 * This will pull the BUI from the AIL and

		 * free the memory associated with it.

		 */

		set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);

		set_bit(XFS_LI_RECOVERED, &buip->bui_item.li_flags);

		xfs_bui_release(buip);

		return -EFSCORRUPTED;

	}
@@ -537,7 +537,7 @@ xfs_bui_recover( 
		xfs_bmap_unmap_extent(tp, ip, &irec);

	}



	set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);

	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);
@@ -568,7 +568,7 @@ xfs_bui_item_recover( 
	/*

	 * Skip BUIs that we've already processed.

	 */

	if (test_bit(XFS_BUI_RECOVERED, &buip->bui_flags))

	if (test_bit(XFS_LI_RECOVERED, &buip->bui_item.li_flags))

		return 0;



	spin_unlock(&ailp->ail_lock);

fs/xfs/xfs_bmap_item.h

+0 −6
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ struct kmem_zone; 
 */

#define	XFS_BUI_MAX_FAST_EXTENTS	1



/*

 * Define BUI flag bits. Manipulated by set/clear/test_bit operators.

 */

#define	XFS_BUI_RECOVERED		1



/*

 * This is the "bmap update intent" log item.  It is used to log the fact that

 * some reverse mappings need to change.  It is used in conjunction with the
@@ -49,7 +44,6 @@ struct xfs_bui_log_item { 
	struct xfs_log_item		bui_item;

	atomic_t			bui_refcount;

	atomic_t			bui_next_extent;

	unsigned long			bui_flags;	/* misc flags */

	struct xfs_bui_log_format	bui_format;

};

fs/xfs/xfs_extfree_item.c

+4 −4
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ xfs_efi_recover( 
	xfs_extent_t		*extp;

	xfs_fsblock_t		startblock_fsb;



	ASSERT(!test_bit(XFS_EFI_RECOVERED, &efip->efi_flags));

	ASSERT(!test_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags));



	/*

	 * First check the validity of the extents described by the
@@ -611,7 +611,7 @@ xfs_efi_recover( 
			 * This will pull the EFI from the AIL and

			 * free the memory associated with it.

			 */

			set_bit(XFS_EFI_RECOVERED, &efip->efi_flags);

			set_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags);

			xfs_efi_release(efip);

			return -EFSCORRUPTED;

		}
@@ -632,7 +632,7 @@ xfs_efi_recover( 


	}



	set_bit(XFS_EFI_RECOVERED, &efip->efi_flags);

	set_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags);

	error = xfs_trans_commit(tp);

	return error;
@@ -655,7 +655,7 @@ xfs_efi_item_recover( 
	 * Skip EFIs that we've already processed.

	 */

	efip = container_of(lip, struct xfs_efi_log_item, efi_item);

	if (test_bit(XFS_EFI_RECOVERED, &efip->efi_flags))

	if (test_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags))

		return 0;



	spin_unlock(&ailp->ail_lock);

fs/xfs/xfs_extfree_item.h

+0 −6
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ struct kmem_zone; 
 */

#define	XFS_EFI_MAX_FAST_EXTENTS	16



/*

 * Define EFI flag bits. Manipulated by set/clear/test_bit operators.

 */

#define	XFS_EFI_RECOVERED	1



/*

 * This is the "extent free intention" log item.  It is used to log the fact

 * that some extents need to be free.  It is used in conjunction with the
@@ -54,7 +49,6 @@ struct xfs_efi_log_item { 
	struct xfs_log_item	efi_item;

	atomic_t		efi_refcount;

	atomic_t		efi_next_extent;

	unsigned long		efi_flags;	/* misc flags */

	xfs_efi_log_format_t	efi_format;

};

fs/xfs/xfs_refcount_item.c

+4 −4
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ xfs_cui_recover( 
	bool				requeue_only = false;

	struct xfs_mount		*mp = parent_tp->t_mountp;



	ASSERT(!test_bit(XFS_CUI_RECOVERED, &cuip->cui_flags));

	ASSERT(!test_bit(XFS_LI_RECOVERED, &cuip->cui_item.li_flags));



	/*

	 * First check the validity of the extents described by the
@@ -472,7 +472,7 @@ xfs_cui_recover( 
			 * This will pull the CUI from the AIL and

			 * free the memory associated with it.

			 */

			set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags);

			set_bit(XFS_LI_RECOVERED, &cuip->cui_item.li_flags);

			xfs_cui_release(cuip);

			return -EFSCORRUPTED;

		}
@@ -556,7 +556,7 @@ xfs_cui_recover( 
	}



	xfs_refcount_finish_one_cleanup(tp, rcur, error);

	set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags);

	set_bit(XFS_LI_RECOVERED, &cuip->cui_item.li_flags);

	xfs_defer_move(parent_tp, tp);

	error = xfs_trans_commit(tp);

	return error;
@@ -581,7 +581,7 @@ xfs_cui_item_recover( 
	/*

	 * Skip CUIs that we've already processed.

	 */

	if (test_bit(XFS_CUI_RECOVERED, &cuip->cui_flags))

	if (test_bit(XFS_LI_RECOVERED, &cuip->cui_item.li_flags))

		return 0;



	spin_unlock(&ailp->ail_lock);