Re: [PATCH 7/8] xfs: whiteouts release intents that are not in the AIL

Darrick J. Wong
2022-04-27T03:19:19Z

On Wed, Apr 27, 2022 at 12:22:58PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> When we release an intent that a whiteout applies to, it will not
> have been committed to the journal and so won't be in the AIL. Hence
> when we drop the last reference to the intent, we do not want to try
> to remove it from the AIL as that will trigger a filesystem
> shutdown. Hence make the removal of intents from the AIL conditional
> on them actually being in the AIL so we do the correct thing.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> Reviewed-by: Allison Henderson <allison.henderson@oracle.com>

Same provisional RVB as the last patch.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
> fs/xfs/xfs_bmap_item.c | 8 +++++---
> fs/xfs/xfs_extfree_item.c | 8 +++++---
> fs/xfs/xfs_refcount_item.c | 8 +++++---
> fs/xfs/xfs_rmap_item.c | 8 +++++---
> 4 files changed, 20 insertions(+), 12 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> index e1b0e321d604..59aa5f9bf769 100644
> --- a/fs/xfs/xfs_bmap_item.c
> +++ b/fs/xfs/xfs_bmap_item.c
> @@ -54,10 +54,12 @@ xfs_bui_release(
> struct xfs_bui_log_item *buip)
> {
> ASSERT(atomic_read(&buip->bui_refcount) > 0);
> - if (atomic_dec_and_test(&buip->bui_refcount)) {
> + if (!atomic_dec_and_test(&buip->bui_refcount))
> + return;
> +
> + if (test_bit(XFS_LI_IN_AIL, &buip->bui_item.li_flags))
> xfs_trans_ail_delete(&buip->bui_item, SHUTDOWN_LOG_IO_ERROR);
> - xfs_bui_item_free(buip);
> - }
> + xfs_bui_item_free(buip);
> }
>
>
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index 032db5269e97..893a7dd15cbb 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -58,10 +58,12 @@ xfs_efi_release(
> struct xfs_efi_log_item *efip)
> {
> ASSERT(atomic_read(&efip->efi_refcount) > 0);
> - if (atomic_dec_and_test(&efip->efi_refcount)) {
> + if (!atomic_dec_and_test(&efip->efi_refcount))
> + return;
> +
> + if (test_bit(XFS_LI_IN_AIL, &efip->efi_item.li_flags))
> xfs_trans_ail_delete(&efip->efi_item, SHUTDOWN_LOG_IO_ERROR);
> - xfs_efi_item_free(efip);
> - }
> + xfs_efi_item_free(efip);
> }
>
> /*
> diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
> index a2213b5ee344..1b82b818f515 100644
> --- a/fs/xfs/xfs_refcount_item.c
> +++ b/fs/xfs/xfs_refcount_item.c
> @@ -53,10 +53,12 @@ xfs_cui_release(
> struct xfs_cui_log_item *cuip)
> {
> ASSERT(atomic_read(&cuip->cui_refcount) > 0);
> - if (atomic_dec_and_test(&cuip->cui_refcount)) {
> + if (!atomic_dec_and_test(&cuip->cui_refcount))
> + return;
> +
> + if (test_bit(XFS_LI_IN_AIL, &cuip->cui_item.li_flags))
> xfs_trans_ail_delete(&cuip->cui_item, SHUTDOWN_LOG_IO_ERROR);
> - xfs_cui_item_free(cuip);
> - }
> + xfs_cui_item_free(cuip);
> }
>
>
> diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
> index 053eb135380c..99dfb3ae7e9c 100644
> --- a/fs/xfs/xfs_rmap_item.c
> +++ b/fs/xfs/xfs_rmap_item.c
> @@ -53,10 +53,12 @@ xfs_rui_release(
> struct xfs_rui_log_item *ruip)
> {
> ASSERT(atomic_read(&ruip->rui_refcount) > 0);
> - if (atomic_dec_and_test(&ruip->rui_refcount)) {
> + if (!atomic_dec_and_test(&ruip->rui_refcount))
> + return;
> +
> + if (test_bit(XFS_LI_IN_AIL, &ruip->rui_item.li_flags))
> xfs_trans_ail_delete(&ruip->rui_item, SHUTDOWN_LOG_IO_ERROR);
> - xfs_rui_item_free(ruip);
> - }
> + xfs_rui_item_free(ruip);
> }
>
> STATIC void
> --
> 2.35.1
>