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 1/6] mkfs: check root inode location
Date: Tue, 31 Dec 2019 17:20:48 -0800 [thread overview]
Message-ID: <157784164821.1371066.13806897497760939622.stgit@magnolia> (raw)
In-Reply-To: <157784164200.1371066.15490825981810186191.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Make sure the root inode gets created where repair thinks it should be
created.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
libxfs/libxfs_api_defs.h | 1 +
mkfs/xfs_mkfs.c | 39 +++++++++++++++++++++++++++++++++------
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 99d12c34..b042f0a2 100644
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -173,5 +173,6 @@
#define xfs_dir2_data_bestfree_p libxfs_dir2_data_bestfree_p
#define xfs_dir2_data_get_ftype libxfs_dir2_data_get_ftype
#define xfs_dir2_data_put_ftype libxfs_dir2_data_put_ftype
+#define xfs_ialloc_calc_rootino libxfs_ialloc_calc_rootino
#endif /* __LIBXFS_API_DEFS_H__ */
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 784fe6a9..91a25bf5 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3549,6 +3549,38 @@ rewrite_secondary_superblocks(
libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
}
+static void
+check_root_ino(
+ struct xfs_mount *mp)
+{
+ xfs_ino_t ino;
+
+ if (XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rootino) != 0) {
+ fprintf(stderr,
+ _("%s: root inode created in AG %u, not AG 0\n"),
+ progname, XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rootino));
+ exit(1);
+ }
+
+ /*
+ * The superblock points to the root directory inode, but xfs_repair
+ * expects to find the root inode in a very specific location computed
+ * from the filesystem geometry for an extra level of verification.
+ *
+ * Fail the format immediately if those assumptions ever break, because
+ * repair will toss the root directory.
+ */
+ ino = libxfs_ialloc_calc_rootino(mp, mp->m_sb.sb_unit);
+ if (mp->m_sb.sb_rootino != ino) {
+ fprintf(stderr,
+ _("%s: root inode (%llu) not allocated in expected location (%llu)\n"),
+ progname,
+ (unsigned long long)mp->m_sb.sb_rootino,
+ (unsigned long long)ino);
+ exit(1);
+ }
+}
+
int
main(
int argc,
@@ -3835,12 +3867,7 @@ main(
/*
* Protect ourselves against possible stupidity
*/
- if (XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rootino) != 0) {
- fprintf(stderr,
- _("%s: root inode created in AG %u, not AG 0\n"),
- progname, XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rootino));
- exit(1);
- }
+ check_root_ino(mp);
/*
* Re-write multiple secondary superblocks with rootinode field set
next prev parent reply other threads:[~2020-01-01 1:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Darrick J. Wong [this message]
2020-01-01 1:20 ` [PATCH 2/6] xfs_repair: enforce that inode btree chunks can't point to AG headers Darrick J. Wong
2020-01-01 1:21 ` [PATCH 3/6] xfs_repair: refactor fixed inode location checks Darrick J. Wong
2020-01-01 1:21 ` [PATCH 4/6] xfs_repair: use libxfs function to calculate root inode location Darrick J. Wong
2020-01-01 1:21 ` [PATCH 5/6] xfs_repair: check plausibility of root dir pointer before trashing it Darrick J. Wong
2020-01-01 1:21 ` [PATCH 6/6] xfs_repair: try to correct sb_unit value from secondaries Darrick J. Wong
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
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=157784164821.1371066.13806897497760939622.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 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).