Message ID | 20210902095927.911100-6-david@fromorbit.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | xfs: intent item whiteouts | expand |
On 9/2/21 2:59 AM, 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> Ok, makes sense Reviewed-by: Allison Henderson <allison.henderson@oracle.com> > --- > fs/xfs/xfs_attr_item.c | 11 ++++++----- > 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 +++++--- > 5 files changed, 26 insertions(+), 17 deletions(-) > > diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c > index 86c8d5d08176..11546967a5d7 100644 > --- a/fs/xfs/xfs_attr_item.c > +++ b/fs/xfs/xfs_attr_item.c > @@ -67,11 +67,12 @@ xfs_attri_release( > struct xfs_attri_log_item *attrip) > { > ASSERT(atomic_read(&attrip->attri_refcount) > 0); > - if (atomic_dec_and_test(&attrip->attri_refcount)) { > - xfs_trans_ail_delete(&attrip->attri_item, > - SHUTDOWN_LOG_IO_ERROR); > - xfs_attri_item_free(attrip); > - } > + if (!atomic_dec_and_test(&attrip->attri_refcount)) > + return; > + > + if (test_bit(XFS_LI_IN_AIL, &attrip->attri_item.li_flags)) > + xfs_trans_ail_delete(&attrip->attri_item, SHUTDOWN_LOG_IO_ERROR); > + xfs_attri_item_free(attrip); > } > > STATIC void > diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c > index 0b06159cfd1b..7cabb59138b1 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 87cba4a71883..7032125fe987 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 de739884e857..f62dc5b7af88 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 8d57529d9ddd..0c67abcd189b 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 >
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c index 86c8d5d08176..11546967a5d7 100644 --- a/fs/xfs/xfs_attr_item.c +++ b/fs/xfs/xfs_attr_item.c @@ -67,11 +67,12 @@ xfs_attri_release( struct xfs_attri_log_item *attrip) { ASSERT(atomic_read(&attrip->attri_refcount) > 0); - if (atomic_dec_and_test(&attrip->attri_refcount)) { - xfs_trans_ail_delete(&attrip->attri_item, - SHUTDOWN_LOG_IO_ERROR); - xfs_attri_item_free(attrip); - } + if (!atomic_dec_and_test(&attrip->attri_refcount)) + return; + + if (test_bit(XFS_LI_IN_AIL, &attrip->attri_item.li_flags)) + xfs_trans_ail_delete(&attrip->attri_item, SHUTDOWN_LOG_IO_ERROR); + xfs_attri_item_free(attrip); } STATIC void diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c index 0b06159cfd1b..7cabb59138b1 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 87cba4a71883..7032125fe987 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 de739884e857..f62dc5b7af88 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 8d57529d9ddd..0c67abcd189b 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