From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eric Sandeen <sandeen@sandeen.net>
Cc: linux-xfs@vger.kernel.org, alex@zadara.com
Subject: Re: [PATCH 2/6] xfs_repair: enforce that inode btree chunks can't point to AG headers
Date: Thu, 30 Jan 2020 12:26:00 -0800 [thread overview]
Message-ID: <20200130202600.GE3447196@magnolia> (raw)
In-Reply-To: <eb2b3973-0301-5b96-58e9-7f754a58d0f6@sandeen.net>
On Thu, Jan 30, 2020 at 01:38:52PM -0600, Eric Sandeen wrote:
> On 1/23/20 6:17 PM, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > xfs_repair has a very old check that evidently excuses the AG 0 inode
> > btrees pointing to blocks that are already marked XR_E_INUSE_FS* (e.g.
> > AG headers). mkfs never formats filesystems that way and it looks like
> > an error, so purge the check. After this, we always complain if inodes
> > overlap with AG headers because that should never happen.
>
> I peered back into the mists of time to see if I could find any reason for
> this exception, and I couldn't.
>
> Only question is why you removed the
>
> - ASSERT(M_IGEO(mp)->ialloc_blks > 0);
>
> assert, that's still a valid assert, no?
The superblock validation routines are supposed to reject all the
combinations that can result in ialloc_blks being zero.
That said, I can't think of a reason to remove the assert. If you want
me to put it back, it I can... or pretty-please put it back in for me?
:)
--D
>
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > repair/globals.c | 1 -
> > repair/globals.h | 1 -
> > repair/scan.c | 19 -------------------
> > repair/xfs_repair.c | 7 -------
> > 4 files changed, 28 deletions(-)
> >
> >
> > diff --git a/repair/globals.c b/repair/globals.c
> > index dcd79ea4..8a60e706 100644
> > --- a/repair/globals.c
> > +++ b/repair/globals.c
> > @@ -73,7 +73,6 @@ int lost_gquotino;
> > int lost_pquotino;
> >
> > xfs_agino_t first_prealloc_ino;
> > -xfs_agino_t last_prealloc_ino;
> > xfs_agblock_t bnobt_root;
> > xfs_agblock_t bcntbt_root;
> > xfs_agblock_t inobt_root;
> > diff --git a/repair/globals.h b/repair/globals.h
> > index 008bdd90..2ed5c894 100644
> > --- a/repair/globals.h
> > +++ b/repair/globals.h
> > @@ -114,7 +114,6 @@ extern int lost_gquotino;
> > extern int lost_pquotino;
> >
> > extern xfs_agino_t first_prealloc_ino;
> > -extern xfs_agino_t last_prealloc_ino;
> > extern xfs_agblock_t bnobt_root;
> > extern xfs_agblock_t bcntbt_root;
> > extern xfs_agblock_t inobt_root;
> > diff --git a/repair/scan.c b/repair/scan.c
> > index c383f3aa..05707dd2 100644
> > --- a/repair/scan.c
> > +++ b/repair/scan.c
> > @@ -1645,13 +1645,6 @@ scan_single_ino_chunk(
> > break;
> > case XR_E_INUSE_FS:
> > case XR_E_INUSE_FS1:
> > - if (agno == 0 &&
> > - ino + j >= first_prealloc_ino &&
> > - ino + j < last_prealloc_ino) {
> > - set_bmap(agno, agbno, XR_E_INO);
> > - break;
> > - }
> > - /* fall through */
> > default:
> > /* XXX - maybe should mark block a duplicate */
> > do_warn(
> > @@ -1782,18 +1775,6 @@ _("inode chunk claims untracked block, finobt block - agno %d, bno %d, inopb %d\
> > break;
> > case XR_E_INUSE_FS:
> > case XR_E_INUSE_FS1:
> > - if (agno == 0 &&
> > - ino + j >= first_prealloc_ino &&
> > - ino + j < last_prealloc_ino) {
> > - do_warn(
> > -_("inode chunk claims untracked block, finobt block - agno %d, bno %d, inopb %d\n"),
> > - agno, agbno, mp->m_sb.sb_inopblock);
> > -
> > - set_bmap(agno, agbno, XR_E_INO);
> > - suspect++;
> > - break;
> > - }
> > - /* fall through */
> > default:
> > do_warn(
> > _("inode chunk claims used block, finobt block - agno %d, bno %d, inopb %d\n"),
> > diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
> > index 9295673d..3e9059f3 100644
> > --- a/repair/xfs_repair.c
> > +++ b/repair/xfs_repair.c
> > @@ -460,13 +460,6 @@ calc_mkfs(xfs_mount_t *mp)
> > first_prealloc_ino = XFS_AGB_TO_AGINO(mp, fino_bno);
> > }
> >
> > - ASSERT(M_IGEO(mp)->ialloc_blks > 0);
> > -
> > - if (M_IGEO(mp)->ialloc_blks > 1)
> > - last_prealloc_ino = first_prealloc_ino + XFS_INODES_PER_CHUNK;
> > - else
> > - last_prealloc_ino = XFS_AGB_TO_AGINO(mp, fino_bno + 1);
> > -
> > /*
> > * now the first 3 inodes in the system
> > */
> >
next prev parent reply other threads:[~2020-01-30 20:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 0:17 [PATCH v3 0/6] xfs_repair: do not trash valid root dirs Darrick J. Wong
2020-01-24 0:17 ` [PATCH 1/6] mkfs: check root inode location Darrick J. Wong
2020-01-30 19:32 ` Eric Sandeen
2020-01-30 20:19 ` Darrick J. Wong
2020-01-30 20:34 ` Eric Sandeen
2020-01-24 0:17 ` [PATCH 2/6] xfs_repair: enforce that inode btree chunks can't point to AG headers Darrick J. Wong
2020-01-30 19:38 ` Eric Sandeen
2020-01-30 20:26 ` Darrick J. Wong [this message]
2020-01-30 20:46 ` Eric Sandeen
2020-01-24 0:17 ` [PATCH 3/6] xfs_repair: refactor fixed inode location checks Darrick J. Wong
2020-01-30 19:45 ` Eric Sandeen
2020-01-30 19:52 ` Eric Sandeen
2020-01-24 0:17 ` [PATCH 4/6] xfs_repair: use libxfs function to calculate root inode location Darrick J. Wong
2020-01-30 19:48 ` Eric Sandeen
2020-01-24 0:17 ` [PATCH 5/6] xfs_repair: check plausibility of root dir pointer before trashing it Darrick J. Wong
2020-01-30 20:18 ` Eric Sandeen
2020-01-30 20:34 ` Darrick J. Wong
2020-01-30 20:41 ` Eric Sandeen
2020-01-30 20:50 ` Darrick J. Wong
2020-01-24 0:18 ` [PATCH 6/6] xfs_repair: try to correct sb_unit value from secondaries Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-01-01 1:20 [PATCH v2 0/6] xfs_repair: do not trash valid root dirs Darrick J. Wong
2020-01-01 1:20 ` [PATCH 2/6] xfs_repair: enforce that inode btree chunks can't point to AG headers 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=20200130202600.GE3447196@magnolia \
--to=darrick.wong@oracle.com \
--cc=alex@zadara.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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;
as well as URLs for NNTP newsgroup(s).