Commit 9b4467e9 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: refactor log recovery CUI item dispatch for pass2 commit functions 



Move the refcount update intent and intent-done pass2 commit code into
the per-item source code files and use dispatch functions to call them.
We do these one at a time because there's a lot of code to move.  No
functional changes.

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 07590a9d

fs/xfs/xfs_log_recover.c

+0 −124
Original line number Diff line number Diff line
@@ -2034,126 +2034,6 @@ xlog_buf_readahead( 
		xfs_buf_readahead(log->l_mp->m_ddev_targp, blkno, len, ops);

}



/*

 * Copy an CUI format buffer from the given buf, and into the destination

 * CUI format structure.  The CUI/CUD items were designed not to need any

 * special alignment handling.

 */

static int

xfs_cui_copy_format(

	struct xfs_log_iovec		*buf,

	struct xfs_cui_log_format	*dst_cui_fmt)

{

	struct xfs_cui_log_format	*src_cui_fmt;

	uint				len;



	src_cui_fmt = buf->i_addr;

	len = xfs_cui_log_format_sizeof(src_cui_fmt->cui_nextents);



	if (buf->i_len == len) {

		memcpy(dst_cui_fmt, src_cui_fmt, len);

		return 0;

	}

	XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL);

	return -EFSCORRUPTED;

}



/*

 * This routine is called to create an in-core extent refcount update

 * item from the cui format structure which was logged on disk.

 * It allocates an in-core cui, copies the extents from the format

 * structure into it, and adds the cui to the AIL with the given

 * LSN.

 */

STATIC int

xlog_recover_cui_pass2(

	struct xlog			*log,

	struct xlog_recover_item	*item,

	xfs_lsn_t			lsn)

{

	int				error;

	struct xfs_mount		*mp = log->l_mp;

	struct xfs_cui_log_item		*cuip;

	struct xfs_cui_log_format	*cui_formatp;



	cui_formatp = item->ri_buf[0].i_addr;



	cuip = xfs_cui_init(mp, cui_formatp->cui_nextents);

	error = xfs_cui_copy_format(&item->ri_buf[0], &cuip->cui_format);

	if (error) {

		xfs_cui_item_free(cuip);

		return error;

	}

	atomic_set(&cuip->cui_next_extent, cui_formatp->cui_nextents);



	spin_lock(&log->l_ailp->ail_lock);

	/*

	 * The CUI has two references. One for the CUD and one for CUI to ensure

	 * it makes it into the AIL. Insert the CUI into the AIL directly and

	 * drop the CUI reference. Note that xfs_trans_ail_update() drops the

	 * AIL lock.

	 */

	xfs_trans_ail_update(log->l_ailp, &cuip->cui_item, lsn);

	xfs_cui_release(cuip);

	return 0;

}





/*

 * This routine is called when an CUD format structure is found in a committed

 * transaction in the log. Its purpose is to cancel the corresponding CUI if it

 * was still in the log. To do this it searches the AIL for the CUI with an id

 * equal to that in the CUD format structure. If we find it we drop the CUD

 * reference, which removes the CUI from the AIL and frees it.

 */

STATIC int

xlog_recover_cud_pass2(

	struct xlog			*log,

	struct xlog_recover_item	*item)

{

	struct xfs_cud_log_format	*cud_formatp;

	struct xfs_cui_log_item		*cuip = NULL;

	struct xfs_log_item		*lip;

	uint64_t			cui_id;

	struct xfs_ail_cursor		cur;

	struct xfs_ail			*ailp = log->l_ailp;



	cud_formatp = item->ri_buf[0].i_addr;

	if (item->ri_buf[0].i_len != sizeof(struct xfs_cud_log_format)) {

		XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp);

		return -EFSCORRUPTED;

	}

	cui_id = cud_formatp->cud_cui_id;



	/*

	 * Search for the CUI with the id in the CUD format structure in the

	 * AIL.

	 */

	spin_lock(&ailp->ail_lock);

	lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);

	while (lip != NULL) {

		if (lip->li_type == XFS_LI_CUI) {

			cuip = (struct xfs_cui_log_item *)lip;

			if (cuip->cui_format.cui_id == cui_id) {

				/*

				 * Drop the CUD reference to the CUI. This

				 * removes the CUI from the AIL and frees it.

				 */

				spin_unlock(&ailp->ail_lock);

				xfs_cui_release(cuip);

				spin_lock(&ailp->ail_lock);

				break;

			}

		}

		lip = xfs_trans_ail_cursor_next(ailp, &cur);

	}



	xfs_trans_ail_cursor_done(&cur);

	spin_unlock(&ailp->ail_lock);



	return 0;

}



/*

 * Copy an BUI format buffer from the given buf, and into the destination

 * BUI format structure.  The BUI/BUD items were designed not to need any
@@ -2292,10 +2172,6 @@ xlog_recover_commit_pass2( 
				trans->r_lsn);



	switch (ITEM_TYPE(item)) {

	case XFS_LI_CUI:

		return xlog_recover_cui_pass2(log, item, trans->r_lsn);

	case XFS_LI_CUD:

		return xlog_recover_cud_pass2(log, item);

	case XFS_LI_BUI:

		return xlog_recover_bui_pass2(log, item, trans->r_lsn);

	case XFS_LI_BUD:

fs/xfs/xfs_refcount_item.c

+127 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "xfs_log.h"

#include "xfs_refcount.h"

#include "xfs_error.h"

#include "xfs_log_priv.h"

#include "xfs_log_recover.h"



kmem_zone_t	*xfs_cui_zone;
@@ -28,7 +29,7 @@ static inline struct xfs_cui_log_item *CUI_ITEM(struct xfs_log_item *lip) 
	return container_of(lip, struct xfs_cui_log_item, cui_item);

}



void

STATIC void

xfs_cui_item_free(

	struct xfs_cui_log_item	*cuip)

{
@@ -134,7 +135,7 @@ static const struct xfs_item_ops xfs_cui_item_ops = { 
/*

 * Allocate and initialize an cui item with the given number of extents.

 */

struct xfs_cui_log_item *

STATIC struct xfs_cui_log_item *

xfs_cui_init(

	struct xfs_mount		*mp,

	uint				nextents)
@@ -572,10 +573,134 @@ xfs_cui_recover( 
	return error;

}



/*

 * Copy an CUI format buffer from the given buf, and into the destination

 * CUI format structure.  The CUI/CUD items were designed not to need any

 * special alignment handling.

 */

static int

xfs_cui_copy_format(

	struct xfs_log_iovec		*buf,

	struct xfs_cui_log_format	*dst_cui_fmt)

{

	struct xfs_cui_log_format	*src_cui_fmt;

	uint				len;



	src_cui_fmt = buf->i_addr;

	len = xfs_cui_log_format_sizeof(src_cui_fmt->cui_nextents);



	if (buf->i_len == len) {

		memcpy(dst_cui_fmt, src_cui_fmt, len);

		return 0;

	}

	XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL);

	return -EFSCORRUPTED;

}



/*

 * This routine is called to create an in-core extent refcount update

 * item from the cui format structure which was logged on disk.

 * It allocates an in-core cui, copies the extents from the format

 * structure into it, and adds the cui to the AIL with the given

 * LSN.

 */

STATIC int

xlog_recover_cui_commit_pass2(

	struct xlog			*log,

	struct list_head		*buffer_list,

	struct xlog_recover_item	*item,

	xfs_lsn_t			lsn)

{

	int				error;

	struct xfs_mount		*mp = log->l_mp;

	struct xfs_cui_log_item		*cuip;

	struct xfs_cui_log_format	*cui_formatp;



	cui_formatp = item->ri_buf[0].i_addr;



	cuip = xfs_cui_init(mp, cui_formatp->cui_nextents);

	error = xfs_cui_copy_format(&item->ri_buf[0], &cuip->cui_format);

	if (error) {

		xfs_cui_item_free(cuip);

		return error;

	}

	atomic_set(&cuip->cui_next_extent, cui_formatp->cui_nextents);



	spin_lock(&log->l_ailp->ail_lock);

	/*

	 * The CUI has two references. One for the CUD and one for CUI to ensure

	 * it makes it into the AIL. Insert the CUI into the AIL directly and

	 * drop the CUI reference. Note that xfs_trans_ail_update() drops the

	 * AIL lock.

	 */

	xfs_trans_ail_update(log->l_ailp, &cuip->cui_item, lsn);

	xfs_cui_release(cuip);

	return 0;

}



const struct xlog_recover_item_ops xlog_cui_item_ops = {

	.item_type		= XFS_LI_CUI,

	.commit_pass2		= xlog_recover_cui_commit_pass2,

};



/*

 * This routine is called when an CUD format structure is found in a committed

 * transaction in the log. Its purpose is to cancel the corresponding CUI if it

 * was still in the log. To do this it searches the AIL for the CUI with an id

 * equal to that in the CUD format structure. If we find it we drop the CUD

 * reference, which removes the CUI from the AIL and frees it.

 */

STATIC int

xlog_recover_cud_commit_pass2(

	struct xlog			*log,

	struct list_head		*buffer_list,

	struct xlog_recover_item	*item,

	xfs_lsn_t			lsn)

{

	struct xfs_cud_log_format	*cud_formatp;

	struct xfs_cui_log_item		*cuip = NULL;

	struct xfs_log_item		*lip;

	uint64_t			cui_id;

	struct xfs_ail_cursor		cur;

	struct xfs_ail			*ailp = log->l_ailp;



	cud_formatp = item->ri_buf[0].i_addr;

	if (item->ri_buf[0].i_len != sizeof(struct xfs_cud_log_format)) {

		XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp);

		return -EFSCORRUPTED;

	}

	cui_id = cud_formatp->cud_cui_id;



	/*

	 * Search for the CUI with the id in the CUD format structure in the

	 * AIL.

	 */

	spin_lock(&ailp->ail_lock);

	lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);

	while (lip != NULL) {

		if (lip->li_type == XFS_LI_CUI) {

			cuip = (struct xfs_cui_log_item *)lip;

			if (cuip->cui_format.cui_id == cui_id) {

				/*

				 * Drop the CUD reference to the CUI. This

				 * removes the CUI from the AIL and frees it.

				 */

				spin_unlock(&ailp->ail_lock);

				xfs_cui_release(cuip);

				spin_lock(&ailp->ail_lock);

				break;

			}

		}

		lip = xfs_trans_ail_cursor_next(ailp, &cur);

	}



	xfs_trans_ail_cursor_done(&cur);

	spin_unlock(&ailp->ail_lock);



	return 0;

}



const struct xlog_recover_item_ops xlog_cud_item_ops = {

	.item_type		= XFS_LI_CUD,

	.commit_pass2		= xlog_recover_cud_commit_pass2,

};

fs/xfs/xfs_refcount_item.h

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ struct xfs_cud_log_item { 
extern struct kmem_zone	*xfs_cui_zone;

extern struct kmem_zone	*xfs_cud_zone;



struct xfs_cui_log_item *xfs_cui_init(struct xfs_mount *, uint);

void xfs_cui_item_free(struct xfs_cui_log_item *);

void xfs_cui_release(struct xfs_cui_log_item *);

int xfs_cui_recover(struct xfs_trans *parent_tp, struct xfs_cui_log_item *cuip);