From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH] xfs_repair: don't abort on bad directory leaf crc during leaf check
Date: Thu, 19 Mar 2015 14:28:54 -0400 [thread overview]
Message-ID: <20150319182854.GJ11669@laptop.bfoster> (raw)
In-Reply-To: <20150318232239.GB24608@birch.djwong.org>
On Wed, Mar 18, 2015 at 04:22:39PM -0700, Darrick J. Wong wrote:
> longform_dir2_check_leaf() checks a directory leaf block to help
> decide if we need to rebuild the directory. If the verifier fails
> with a CRC or corrupt structure error, rebuild the directory instead
> of aborting.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> repair/phase6.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/repair/phase6.c b/repair/phase6.c
> index 1728609..c09b394 100644
> --- a/repair/phase6.c
> +++ b/repair/phase6.c
> @@ -1951,7 +1951,12 @@ longform_dir2_check_leaf(
> da_bno = mp->m_dirleafblk;
> error = dir_read_buf(ip, da_bno, -1, &bp, &xfs_dir3_leaf1_buf_ops,
> &fixit);
> - if (error) {
> + if (error == EFSBADCRC || error == EFSCORRUPTED || fixit) {
> + do_warn(
> + _("leaf block %u for directory inode %" PRIu64 " bad CRC\n"),
> + da_bno, ip->i_ino);
> + return 1;
> + } else if (error) {
I don't think we'll ever see EFSBADCRC from this codepath (that appears
to be the purpose of 'fixit'). Looking at it further, it's self
documenting and robust against changes in the read codepath, so seems
pretty good to me:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> do_error(
> _("can't read block %u for directory inode %" PRIu64 ", error %d\n"),
> da_bno, ip->i_ino, error);
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-03-19 18:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-18 23:22 [PATCH] xfs_repair: don't abort on bad directory leaf crc during leaf check Darrick J. Wong
2015-03-19 18:28 ` Brian Foster [this message]
2015-03-19 20:03 ` Darrick J. Wong
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=20150319182854.GJ11669@laptop.bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.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