From: Christoph Hellwig <hch@infradead.org>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 5/5] xfs: handle CIl transaction commit failures correctly
Date: Mon, 24 Jan 2011 04:12:49 -0500 [thread overview]
Message-ID: <20110124091249.GF26744@infradead.org> (raw)
In-Reply-To: <1295411400-15614-6-git-send-email-david@fromorbit.com>
> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> index 50753d3..504a804 100644
> --- a/fs/xfs/xfs_trans.c
> +++ b/fs/xfs/xfs_trans.c
> @@ -1754,15 +1754,26 @@ xfs_trans_commit_cil(
> */
> log_vector = xfs_trans_alloc_log_vecs(tp);
> if (!log_vector)
> - return ENOMEM;
> + goto out_enomem;
>
> error = xfs_log_commit_cil(mp, tp, log_vector, commit_lsn, flags);
> - if (error)
> - return error;
> + if (error) {
> + /*
> + * We will only get an error if no modifications have been
> + * made to the items in the transaction. Hence treat it
> + the same as a memory allocation failure.
> + */
> + goto out_enomem;
> + }
>
> current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
> xfs_trans_free(tp);
> return 0;
> +
> +out_enomem:
> + /* caller cleans up transaction */
> + current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
> + return ENOMEM;
_xfs_trans_commit already restores the process flags for an ENOMEM
return, so the failure from xfs_trans_alloc_log_vecs is already
handled correctly. If we want to handle the EIO return from
xfs_log_commit_cil the same way it just needs to be turned into an
ENOMEM. The big questions is if there's any point in having the
shutdown check in xfs_trans_commit_cil - we already do one just before
applying the trans deltas in _xfs_trans_commit, which is handled
correctly and should be sufficient.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2011-01-24 9:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-19 4:29 [PATCH 0/5] xfs: various 2.6.38 candidate bug fixes Dave Chinner
2011-01-19 4:29 ` [PATCH 1/5] xfs: speculative delayed allocation uses rounddown_power_of_2 badly Dave Chinner
2011-01-24 8:59 ` Christoph Hellwig
2011-01-19 4:29 ` [PATCH 2/5] xfs: limit extent length for allocation to AG size Dave Chinner
2011-01-24 9:02 ` Christoph Hellwig
2011-01-24 23:31 ` Dave Chinner
2011-01-19 4:29 ` [PATCH 3/5] xfs: prevent extsize alignment from exceeding maximum extent size Dave Chinner
2011-01-24 9:04 ` Christoph Hellwig
2011-01-24 23:32 ` Dave Chinner
2011-01-19 4:29 ` [PATCH 4/5] xfs: limit extsize to size of AGs and/or MAXEXTLEN Dave Chinner
2011-01-24 9:06 ` Christoph Hellwig
2011-01-24 23:37 ` Dave Chinner
2011-01-19 4:30 ` [PATCH 5/5] xfs: handle CIl transaction commit failures correctly Dave Chinner
2011-01-24 9:12 ` Christoph Hellwig [this message]
2011-01-24 23:42 ` 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=20110124091249.GF26744@infradead.org \
--to=hch@infradead.org \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/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