From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com
Subject: Re: [PATCH 3/2] xfs: free the intent item when allocating recovery transaction fails
Date: Thu, 17 Sep 2020 18:48:46 -0700 [thread overview]
Message-ID: <20200918014846.GT7955@magnolia> (raw)
In-Reply-To: <20200917090645.GB13366@infradead.org>
On Thu, Sep 17, 2020 at 10:06:45AM +0100, Christoph Hellwig wrote:
> On Thu, Sep 17, 2020 at 12:01:35AM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > The recovery functions of all four log intent items fail to free the
> > intent item if the transaction allocation fails. Fix this.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > fs/xfs/xfs_bmap_item.c | 5 ++++-
> > fs/xfs/xfs_extfree_item.c | 5 ++++-
> > fs/xfs/xfs_refcount_item.c | 5 ++++-
> > fs/xfs/xfs_rmap_item.c | 5 ++++-
> > 4 files changed, 16 insertions(+), 4 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> > index 2b1cf3ed8172..85d18cd708ba 100644
> > --- a/fs/xfs/xfs_bmap_item.c
> > +++ b/fs/xfs/xfs_bmap_item.c
> > @@ -484,8 +484,11 @@ xfs_bui_item_recover(
> >
> > error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate,
> > XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK), 0, 0, &tp);
> > - if (error)
> > + if (error) {
> > + xfs_bui_release(buip);
> > return error;
> > + }
>
> This should probably use a common label instead of duplicating the
> release three times.
>
> That beind said I don't think we need either the existing or newly
> added calls. At the end of log recovery we always call
> xlog_recover_cancel_intents, which will release all intents remaining
> in the AIL.
You know, that's right, recovery will clean up all the intents for us if
we fail. Ok, new patch. :)
--D
next prev parent reply other threads:[~2020-09-18 1:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 3:28 [PATCH 0/2] xfs: fix simple problems with log intent recovery Darrick J. Wong
2020-09-17 3:28 ` [PATCH 1/2] xfs: log new intent items created as part of finishing recovered intent items Darrick J. Wong
2020-09-17 4:58 ` Dave Chinner
2020-09-17 9:07 ` Christoph Hellwig
2020-09-17 17:45 ` Darrick J. Wong
2020-09-17 3:28 ` [PATCH 2/2] xfs: attach inode to dquot in xfs_bui_item_recover Darrick J. Wong
2020-09-17 4:54 ` Dave Chinner
2020-09-17 6:36 ` Darrick J. Wong
2020-09-17 7:01 ` [PATCH v2 " Darrick J. Wong
2020-09-17 8:03 ` Dave Chinner
2020-09-17 9:04 ` Christoph Hellwig
2020-09-17 7:01 ` [PATCH 3/2] xfs: free the intent item when allocating recovery transaction fails Darrick J. Wong
2020-09-17 8:05 ` Dave Chinner
2020-09-17 9:06 ` Christoph Hellwig
2020-09-18 1:48 ` Darrick J. Wong [this message]
2020-09-18 2:17 ` [PATCH v2 3/2] xfs: fix simple problems with log intent recovery Darrick J. Wong
2020-09-18 2:19 ` [PATCH v3 3/2] xfs: don't release log intent items when recovery fails Darrick J. Wong
2020-09-19 5:49 ` Christoph Hellwig
2020-09-21 6:49 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918014846.GT7955@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox