summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_extfree_item.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2020-05-01 16:00:55 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2020-05-08 08:50:01 -0700
commitcc560a5a9540be2d907c0c170e29ebde98d13d63 (patch)
treed284a26b972247375195c4bc9f3c028d71e25ea2 /fs/xfs/xfs_extfree_item.c
parent96b60f826713767f222254418c995fb6fd7596b3 (diff)
downloadlinux-stable-cc560a5a9540be2d907c0c170e29ebde98d13d63.tar.gz
linux-stable-cc560a5a9540be2d907c0c170e29ebde98d13d63.tar.bz2
linux-stable-cc560a5a9540be2d907c0c170e29ebde98d13d63.zip
xfs: hoist setting of XFS_LI_RECOVERED to caller
The only purpose of XFS_LI_RECOVERED is to prevent log recovery from trying to replay recovered intents more than once. Therefore, we can move the bit setting up to the ->iop_recover caller. 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>
Diffstat (limited to 'fs/xfs/xfs_extfree_item.c')
-rw-r--r--fs/xfs/xfs_extfree_item.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index a8ee9aaef50d..b9c333bae0a1 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -594,8 +594,6 @@ xfs_efi_item_recover(
int i;
int error = 0;
- ASSERT(!test_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags));
-
/*
* First check the validity of the extents described by the
* EFI. If any are bad, then assume that all are bad and
@@ -613,7 +611,6 @@ xfs_efi_item_recover(
* This will pull the EFI from the AIL and
* free the memory associated with it.
*/
- set_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags);
xfs_efi_release(efip);
return -EFSCORRUPTED;
}
@@ -634,7 +631,6 @@ xfs_efi_item_recover(
}
- set_bit(XFS_LI_RECOVERED, &efip->efi_item.li_flags);
error = xfs_trans_commit(tp);
return error;