[PATCH 22/28] xfs: refactor adding recovered intent items to the log

Darrick J. Wong
2020-05-05T01:13:02Z

From: Darrick J. Wong <darrick.wong@oracle.com>

During recovery, every intent that we recover from the log has to be
added to the AIL. Replace the open-coded addition with a helper.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_log_recover.h | 2 ++
fs/xfs/xfs_bmap_item.c | 10 +---------
fs/xfs/xfs_extfree_item.c | 10 +---------
fs/xfs/xfs_log_recover.c | 17 +++++++++++++++++
fs/xfs/xfs_refcount_item.c | 10 +---------
fs/xfs/xfs_rmap_item.c | 10 +---------
6 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
index b875819a1c04..d8c0eae87179 100644
--- a/fs/xfs/libxfs/xfs_log_recover.h
+++ b/fs/xfs/libxfs/xfs_log_recover.h
@@ -128,5 +128,7 @@ int xlog_recover_process_unlinked(struct xlog *log);

void xlog_recover_release_intent(struct xlog *log, unsigned short intent_type,
uint64_t intent_id);
+void xlog_recover_insert_ail(struct xlog *log, struct xfs_log_item *lip,
+ xfs_lsn_t lsn);

#endif /* __XFS_LOG_RECOVER_H__ */
diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index 96627ea800c8..090dc1c53c92 100644
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -651,15 +651,7 @@ xlog_recover_bmap_intent_commit_pass2(
return error;
}
atomic_set(&buip->bui_next_extent, bui_formatp->bui_nextents);
-
- spin_lock(&log->l_ailp->ail_lock);
- /*
- * The RUI has two references. One for the RUD and one for RUI to ensure
- * it makes it into the AIL. Insert the RUI into the AIL directly and
- * drop the RUI reference. Note that xfs_trans_ail_update() drops the
- * AIL lock.
- */
- xfs_trans_ail_update(log->l_ailp, &buip->bui_item, lsn);
+ xlog_recover_insert_ail(log, &buip->bui_item, lsn);
xfs_bui_release(buip);
return 0;
}
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index 4e1b10ab17a5..dc6ebb5fb8d3 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -711,15 +711,7 @@ xlog_recover_extfree_intent_commit_pass2(
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);
+ xlog_recover_insert_ail(log, &efip->efi_item, lsn);
xfs_efi_release(efip);
return 0;
}
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 55477b9b9311..a2c03d87c374 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1811,6 +1811,23 @@ xlog_recover_release_intent(
spin_unlock(&ailp->ail_lock);
}

+/* Insert a recovered intent item into the AIL. */
+void
+xlog_recover_insert_ail(
+ struct xlog *log,
+ struct xfs_log_item *lip,
+ xfs_lsn_t lsn)
+{
+ /*
+ * The intent has two references. One for the done item and one for the
+ * intent to ensure it makes it into the AIL. Insert the intent into
+ * the AIL directly and drop the intent reference. Note that
+ * xfs_trans_ail_update() drops the AIL lock.
+ */
+ spin_lock(&log->l_ailp->ail_lock);
+ xfs_trans_ail_update(log->l_ailp, lip, lsn);
+}
+
/******************************************************************************
*
* Log recover routines
diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index 27126b136b5a..fdc18576a023 100644
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -660,15 +660,7 @@ xlog_recover_refcount_intent_commit_pass2(
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);
+ xlog_recover_insert_ail(log, &cuip->cui_item, lsn);
xfs_cui_release(cuip);
return 0;
}
diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
index 3987f217415c..f9cd3ff18736 100644
--- a/fs/xfs/xfs_rmap_item.c
+++ b/fs/xfs/xfs_rmap_item.c
@@ -651,15 +651,7 @@ xlog_recover_rmap_intent_commit_pass2(
return error;
}
atomic_set(&ruip->rui_next_extent, rui_formatp->rui_nextents);
-
- spin_lock(&log->l_ailp->ail_lock);
- /*
- * The RUI has two references. One for the RUD and one for RUI to ensure
- * it makes it into the AIL. Insert the RUI into the AIL directly and
- * drop the RUI reference. Note that xfs_trans_ail_update() drops the
- * AIL lock.
- */
- xfs_trans_ail_update(log->l_ailp, &ruip->rui_item, lsn);
+ xlog_recover_insert_ail(log, &ruip->rui_item, lsn);
xfs_rui_release(ruip);
return 0;
}