xfs: refactor adding recovered intent items to the log]
PATCH 20/25 xfs: refactor adding recovered intent items to the log]
[Forwarding this RVB to the list for more permanent recording...]
--D
----- Forwarded message from Chandan Babu R <[email protected]> -----
Date: Thu, 07 May 2020 09:32:27 +0530
From: Chandan Babu R <[email protected]>
To: "Darrick J. Wong" <[email protected]>
Subject: Re: [PATCH 20/25] xfs: refactor adding recovered intent items to the log
Quoted 5 lines · IST you
From: Darrick J. Wong <[email protected]>
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.
The changes look good to me.
Reviewed-by Chandan Babu R <[email protected]>
Quoted 141 lines
Signed-off-by Darrick J. Wong <[email protected]>--- fs/xfs/xfs_bmap_item.c | 10 +++------- fs/xfs/xfs_extfree_item.c | 10 +++------- fs/xfs/xfs_refcount_item.c | 10 +++------- fs/xfs/xfs_rmap_item.c | 10 +++------- fs/xfs/xfs_trans_ail.c | 11 +++++++++++ fs/xfs/xfs_trans_priv.h | 3 +++ 6 files changed, 26 insertions(+), 28 deletions(-)fs/xfs/xfs_bmap_item.c +3
-7@@ -651,15 +651,11 @@ xlog_recover_bui_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. +* Insert the intent into the AIL directly and drop one reference so +* that finishing or canceling the work will drop the other. */ -xfs_trans_ail_update (log->l_ailp, &buip->bui_item, lsn); +xfs_trans_ail_insert (log->l_ailp, &buip->bui_item, lsn);xfs_bui_release (buip);return 0 ; }fs/xfs/xfs_extfree_item.c +3
-7@@ -710,15 +710,11 @@ xlog_recover_efi_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. +* Insert the intent into the AIL directly and drop one reference so +* that finishing or canceling the work will drop the other. */ -xfs_trans_ail_update (log->l_ailp, &efip->efi_item, lsn); +xfs_trans_ail_insert (log->l_ailp, &efip->efi_item, lsn);xfs_efi_release (efip);return 0 ; }fs/xfs/xfs_refcount_item.c +3
-7@@ -660,15 +660,11 @@ xlog_recover_cui_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. +* Insert the intent into the AIL directly and drop one reference so +* that finishing or canceling the work will drop the other. */ -xfs_trans_ail_update (log->l_ailp, &cuip->cui_item, lsn); +xfs_trans_ail_insert (log->l_ailp, &cuip->cui_item, lsn);xfs_cui_release (cuip);return 0 ; }fs/xfs/xfs_rmap_item.c +3
-7@@ -651,15 +651,11 @@ xlog_recover_rui_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. +* Insert the intent into the AIL directly and drop one reference so +* that finishing or canceling the work will drop the other. */ -xfs_trans_ail_update (log->l_ailp, &ruip->rui_item, lsn); +xfs_trans_ail_insert (log->l_ailp, &ruip->rui_item, lsn);xfs_rui_release (ruip);return 0 ; }fs/xfs/xfs_trans_ail.c +11
-0@@ -815,6 +815,17 @@ xfs_trans_ail_update_bulk(xfs_ail_update_finish (ailp, tail_lsn); } +/* Insert a log item into the AIL. */ +void +xfs_trans_ail_insert ( +struct xfs_ail *ailp, +struct xfs_log_item *lip, +xfs_lsn_t lsn) +{ +spin_lock (&ailp->ail_lock); +xfs_trans_ail_update_bulk (ailp,NULL , &lip,1 , lsn); +} +/* * Delete one log item from the AIL. * fs/xfs/xfs_trans_priv.h +3
-0@@ -91,6 +91,9 @@ xfs_trans_ail_update(xfs_trans_ail_update_bulk (ailp,NULL , &lip,1 , lsn); } +void xfs_trans_ail_insert (struct xfs_ail *ailp,struct xfs_log_item *lip, +xfs_lsn_t lsn); +xfs_lsn_t xfs_ail_delete_one (struct xfs_ail *ailp,struct xfs_log_item *lip); void xfs_ail_update_finish(struct xfs_ail *ailp, xfs_lsn_t old_lsn) __releases(ailp->ail_lock);
Signature · 6 lines
chandan ----- End forwarded message -----