From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, alex@zadara.com
Subject: [PATCH 3/7] xfs_repair: enforce that inode btree chunks can't point to AG headers
Date: Tue, 04 Feb 2020 16:46:56 -0800 [thread overview]
Message-ID: <158086361666.2079685.8451949513769071894.stgit@magnolia> (raw)
In-Reply-To: <158086359783.2079685.9581209719946834913.stgit@magnolia>
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.
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-02-05 0:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 0:46 [PATCH v4 0/7] xfs_repair: do not trash valid root dirs Darrick J. Wong
2020-02-05 0:46 ` [PATCH 1/7] xfs_repair: replace verify_inum with libxfs inode validators Darrick J. Wong
2020-02-05 0:50 ` Darrick J. Wong
2020-02-17 13:50 ` Christoph Hellwig
2020-02-19 4:32 ` Darrick J. Wong
2020-02-26 16:55 ` Eric Sandeen
2020-02-05 0:46 ` [PATCH 2/7] mkfs: check root inode location Darrick J. Wong
2020-02-17 13:50 ` Christoph Hellwig
2020-02-05 0:46 ` Darrick J. Wong [this message]
2020-02-17 13:51 ` [PATCH 3/7] xfs_repair: enforce that inode btree chunks can't point to AG headers Christoph Hellwig
2020-02-26 17:09 ` Eric Sandeen
2020-02-26 17:24 ` Darrick J. Wong
2020-02-26 17:34 ` Eric Sandeen
2020-02-26 17:19 ` Eric Sandeen
2020-02-26 17:32 ` Darrick J. Wong
2020-02-26 17:40 ` Eric Sandeen
2020-02-05 0:47 ` [PATCH 4/7] xfs_repair: refactor fixed inode location checks Darrick J. Wong
2020-02-17 13:51 ` Christoph Hellwig
2020-02-05 0:47 ` [PATCH 5/7] xfs_repair: use libxfs function to calculate root inode location Darrick J. Wong
2020-02-17 13:53 ` Christoph Hellwig
2020-02-05 0:47 ` [PATCH 6/7] xfs_repair: check plausibility of root dir pointer before trashing it Darrick J. Wong
2020-02-17 13:53 ` Christoph Hellwig
2020-02-05 0:47 ` [PATCH 7/7] xfs_repair: try to correct sb_unit value from secondaries Darrick J. Wong
2020-02-17 13:55 ` Christoph Hellwig
2020-02-26 17:42 ` Eric Sandeen
2020-02-26 17:55 ` 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=158086361666.2079685.8451949513769071894.stgit@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.