xfs: refactor log recovery EFI item dispatch for pass2 commit functions
Move the extent free 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: 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
parent
3ec6efa703
commit
9817aa80dc
|
|
@ -22,6 +22,7 @@
|
|||
#include "xfs_bmap.h"
|
||||
#include "xfs_trace.h"
|
||||
#include "xfs_error.h"
|
||||
#include "xfs_log_priv.h"
|
||||
#include "xfs_log_recover.h"
|
||||
|
||||
kmem_zone_t *xfs_efi_zone;
|
||||
|
|
@ -32,7 +33,7 @@ static inline struct xfs_efi_log_item *EFI_ITEM(struct xfs_log_item *lip)
|
|||
return container_of(lip, struct xfs_efi_log_item, efi_item);
|
||||
}
|
||||
|
||||
void
|
||||
STATIC void
|
||||
xfs_efi_item_free(
|
||||
struct xfs_efi_log_item *efip)
|
||||
{
|
||||
|
|
@ -151,7 +152,7 @@ static const struct xfs_item_ops xfs_efi_item_ops = {
|
|||
/*
|
||||
* Allocate and initialize an efi item with the given number of extents.
|
||||
*/
|
||||
struct xfs_efi_log_item *
|
||||
STATIC struct xfs_efi_log_item *
|
||||
xfs_efi_init(
|
||||
struct xfs_mount *mp,
|
||||
uint nextents)
|
||||
|
|
@ -185,7 +186,7 @@ xfs_efi_init(
|
|||
* one of which will be the native format for this kernel.
|
||||
* It will handle the conversion of formats if necessary.
|
||||
*/
|
||||
int
|
||||
STATIC int
|
||||
xfs_efi_copy_format(xfs_log_iovec_t *buf, xfs_efi_log_format_t *dst_efi_fmt)
|
||||
{
|
||||
xfs_efi_log_format_t *src_efi_fmt = buf->i_addr;
|
||||
|
|
@ -646,10 +647,110 @@ abort_error:
|
|||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* This routine is called to create an in-core extent free intent
|
||||
* item from the efi format structure which was logged on disk.
|
||||
* It allocates an in-core efi, copies the extents from the format
|
||||
* structure into it, and adds the efi to the AIL with the given
|
||||
* LSN.
|
||||
*/
|
||||
STATIC int
|
||||
xlog_recover_efi_commit_pass2(
|
||||
struct xlog *log,
|
||||
struct list_head *buffer_list,
|
||||
struct xlog_recover_item *item,
|
||||
xfs_lsn_t lsn)
|
||||
{
|
||||
struct xfs_mount *mp = log->l_mp;
|
||||
struct xfs_efi_log_item *efip;
|
||||
struct xfs_efi_log_format *efi_formatp;
|
||||
int error;
|
||||
|
||||
efi_formatp = item->ri_buf[0].i_addr;
|
||||
|
||||
efip = xfs_efi_init(mp, efi_formatp->efi_nextents);
|
||||
error = xfs_efi_copy_format(&item->ri_buf[0], &efip->efi_format);
|
||||
if (error) {
|
||||
xfs_efi_item_free(efip);
|
||||
return error;
|
||||
}
|
||||
atomic_set(&efip->efi_next_extent, efi_formatp->efi_nextents);
|
||||
|
||||
spin_lock(&log->l_ailp->ail_lock);
|
||||
/*
|
||||
* The EFI has two references. One for the EFD and one for EFI to ensure
|
||||
* it makes it into the AIL. Insert the EFI into the AIL directly and
|
||||
* drop the EFI reference. Note that xfs_trans_ail_update() drops the
|
||||
* AIL lock.
|
||||
*/
|
||||
xfs_trans_ail_update(log->l_ailp, &efip->efi_item, lsn);
|
||||
xfs_efi_release(efip);
|
||||
return 0;
|
||||
}
|
||||
|
||||
const struct xlog_recover_item_ops xlog_efi_item_ops = {
|
||||
.item_type = XFS_LI_EFI,
|
||||
.commit_pass2 = xlog_recover_efi_commit_pass2,
|
||||
};
|
||||
|
||||
/*
|
||||
* This routine is called when an EFD format structure is found in a committed
|
||||
* transaction in the log. Its purpose is to cancel the corresponding EFI if it
|
||||
* was still in the log. To do this it searches the AIL for the EFI with an id
|
||||
* equal to that in the EFD format structure. If we find it we drop the EFD
|
||||
* reference, which removes the EFI from the AIL and frees it.
|
||||
*/
|
||||
STATIC int
|
||||
xlog_recover_efd_commit_pass2(
|
||||
struct xlog *log,
|
||||
struct list_head *buffer_list,
|
||||
struct xlog_recover_item *item,
|
||||
xfs_lsn_t lsn)
|
||||
{
|
||||
struct xfs_ail_cursor cur;
|
||||
struct xfs_efd_log_format *efd_formatp;
|
||||
struct xfs_efi_log_item *efip = NULL;
|
||||
struct xfs_log_item *lip;
|
||||
struct xfs_ail *ailp = log->l_ailp;
|
||||
uint64_t efi_id;
|
||||
|
||||
efd_formatp = item->ri_buf[0].i_addr;
|
||||
ASSERT((item->ri_buf[0].i_len == (sizeof(xfs_efd_log_format_32_t) +
|
||||
((efd_formatp->efd_nextents - 1) * sizeof(xfs_extent_32_t)))) ||
|
||||
(item->ri_buf[0].i_len == (sizeof(xfs_efd_log_format_64_t) +
|
||||
((efd_formatp->efd_nextents - 1) * sizeof(xfs_extent_64_t)))));
|
||||
efi_id = efd_formatp->efd_efi_id;
|
||||
|
||||
/*
|
||||
* Search for the EFI with the id in the EFD 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_EFI) {
|
||||
efip = (struct xfs_efi_log_item *)lip;
|
||||
if (efip->efi_format.efi_id == efi_id) {
|
||||
/*
|
||||
* Drop the EFD reference to the EFI. This
|
||||
* removes the EFI from the AIL and frees it.
|
||||
*/
|
||||
spin_unlock(&ailp->ail_lock);
|
||||
xfs_efi_release(efip);
|
||||
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_efd_item_ops = {
|
||||
.item_type = XFS_LI_EFD,
|
||||
.commit_pass2 = xlog_recover_efd_commit_pass2,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -78,10 +78,6 @@ struct xfs_efd_log_item {
|
|||
extern struct kmem_zone *xfs_efi_zone;
|
||||
extern struct kmem_zone *xfs_efd_zone;
|
||||
|
||||
struct xfs_efi_log_item *xfs_efi_init(struct xfs_mount *, uint);
|
||||
int xfs_efi_copy_format(xfs_log_iovec_t *buf,
|
||||
xfs_efi_log_format_t *dst_efi_fmt);
|
||||
void xfs_efi_item_free(struct xfs_efi_log_item *);
|
||||
void xfs_efi_release(struct xfs_efi_log_item *);
|
||||
|
||||
int xfs_efi_recover(struct xfs_mount *mp,
|
||||
|
|
|
|||
|
|
@ -2034,102 +2034,6 @@ xlog_buf_readahead(
|
|||
xfs_buf_readahead(log->l_mp->m_ddev_targp, blkno, len, ops);
|
||||
}
|
||||
|
||||
/*
|
||||
* This routine is called to create an in-core extent free intent
|
||||
* item from the efi format structure which was logged on disk.
|
||||
* It allocates an in-core efi, copies the extents from the format
|
||||
* structure into it, and adds the efi to the AIL with the given
|
||||
* LSN.
|
||||
*/
|
||||
STATIC int
|
||||
xlog_recover_efi_pass2(
|
||||
struct xlog *log,
|
||||
struct xlog_recover_item *item,
|
||||
xfs_lsn_t lsn)
|
||||
{
|
||||
int error;
|
||||
struct xfs_mount *mp = log->l_mp;
|
||||
struct xfs_efi_log_item *efip;
|
||||
struct xfs_efi_log_format *efi_formatp;
|
||||
|
||||
efi_formatp = item->ri_buf[0].i_addr;
|
||||
|
||||
efip = xfs_efi_init(mp, efi_formatp->efi_nextents);
|
||||
error = xfs_efi_copy_format(&item->ri_buf[0], &efip->efi_format);
|
||||
if (error) {
|
||||
xfs_efi_item_free(efip);
|
||||
return error;
|
||||
}
|
||||
atomic_set(&efip->efi_next_extent, efi_formatp->efi_nextents);
|
||||
|
||||
spin_lock(&log->l_ailp->ail_lock);
|
||||
/*
|
||||
* The EFI has two references. One for the EFD and one for EFI to ensure
|
||||
* it makes it into the AIL. Insert the EFI into the AIL directly and
|
||||
* drop the EFI reference. Note that xfs_trans_ail_update() drops the
|
||||
* AIL lock.
|
||||
*/
|
||||
xfs_trans_ail_update(log->l_ailp, &efip->efi_item, lsn);
|
||||
xfs_efi_release(efip);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This routine is called when an EFD format structure is found in a committed
|
||||
* transaction in the log. Its purpose is to cancel the corresponding EFI if it
|
||||
* was still in the log. To do this it searches the AIL for the EFI with an id
|
||||
* equal to that in the EFD format structure. If we find it we drop the EFD
|
||||
* reference, which removes the EFI from the AIL and frees it.
|
||||
*/
|
||||
STATIC int
|
||||
xlog_recover_efd_pass2(
|
||||
struct xlog *log,
|
||||
struct xlog_recover_item *item)
|
||||
{
|
||||
xfs_efd_log_format_t *efd_formatp;
|
||||
struct xfs_efi_log_item *efip = NULL;
|
||||
struct xfs_log_item *lip;
|
||||
uint64_t efi_id;
|
||||
struct xfs_ail_cursor cur;
|
||||
struct xfs_ail *ailp = log->l_ailp;
|
||||
|
||||
efd_formatp = item->ri_buf[0].i_addr;
|
||||
ASSERT((item->ri_buf[0].i_len == (sizeof(xfs_efd_log_format_32_t) +
|
||||
((efd_formatp->efd_nextents - 1) * sizeof(xfs_extent_32_t)))) ||
|
||||
(item->ri_buf[0].i_len == (sizeof(xfs_efd_log_format_64_t) +
|
||||
((efd_formatp->efd_nextents - 1) * sizeof(xfs_extent_64_t)))));
|
||||
efi_id = efd_formatp->efd_efi_id;
|
||||
|
||||
/*
|
||||
* Search for the EFI with the id in the EFD 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_EFI) {
|
||||
efip = (struct xfs_efi_log_item *)lip;
|
||||
if (efip->efi_format.efi_id == efi_id) {
|
||||
/*
|
||||
* Drop the EFD reference to the EFI. This
|
||||
* removes the EFI from the AIL and frees it.
|
||||
*/
|
||||
spin_unlock(&ailp->ail_lock);
|
||||
xfs_efi_release(efip);
|
||||
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;
|
||||
}
|
||||
|
||||
/*
|
||||
* This routine is called to create an in-core extent rmap update
|
||||
* item from the rui format structure which was logged on disk.
|
||||
|
|
@ -2481,10 +2385,6 @@ xlog_recover_commit_pass2(
|
|||
trans->r_lsn);
|
||||
|
||||
switch (ITEM_TYPE(item)) {
|
||||
case XFS_LI_EFI:
|
||||
return xlog_recover_efi_pass2(log, item, trans->r_lsn);
|
||||
case XFS_LI_EFD:
|
||||
return xlog_recover_efd_pass2(log, item);
|
||||
case XFS_LI_RUI:
|
||||
return xlog_recover_rui_pass2(log, item, trans->r_lsn);
|
||||
case XFS_LI_RUD:
|
||||
|
|
|
|||
Loading…
Reference in New Issue