From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, Eric Sandeen <sandeen@redhat.com>,
alex@zadara.com
Subject: [PATCH 4/7] xfs_repair: refactor fixed inode location checks
Date: Tue, 04 Feb 2020 16:47:02 -0800 [thread overview]
Message-ID: <158086362282.2079685.17208024677816310215.stgit@magnolia> (raw)
In-Reply-To: <158086359783.2079685.9581209719946834913.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Refactor the checking and resetting of fixed-location inodes (root,
rbmino, rsumino) into a helper function.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
---
repair/xfs_repair.c | 106 ++++++++++++++++++---------------------------------
1 file changed, 37 insertions(+), 69 deletions(-)
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 3e9059f3..f8005f8a 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -395,6 +395,37 @@ do_log(char const *msg, ...)
va_end(args);
}
+/* Make sure a fixed-location inode is where it should be. */
+static void
+validate_sb_ino(
+ xfs_ino_t *ino,
+ xfs_ino_t expected_ino,
+ const char *tag)
+{
+ if (*ino == expected_ino)
+ return;
+
+ do_warn(
+_("sb %s inode value %" PRIu64 " %sinconsistent with calculated value %"PRIu64"\n"),
+ tag, *ino, *ino == NULLFSINO ? "(NULLFSINO) " : "",
+ expected_ino);
+
+ if (!no_modify)
+ do_warn(
+_("resetting superblock %s inode pointer to %"PRIu64"\n"),
+ tag, expected_ino);
+ else
+ do_warn(
+_("would reset superblock %s inode pointer to %"PRIu64"\n"),
+ tag, expected_ino);
+
+ /*
+ * Just set the value -- safe since the superblock doesn't get flushed
+ * out if no_modify is set.
+ */
+ *ino = expected_ino;
+}
+
static void
calc_mkfs(xfs_mount_t *mp)
{
@@ -463,75 +494,12 @@ calc_mkfs(xfs_mount_t *mp)
/*
* now the first 3 inodes in the system
*/
- if (mp->m_sb.sb_rootino != first_prealloc_ino) {
- do_warn(
-_("sb root inode value %" PRIu64 " %sinconsistent with calculated value %u\n"),
- mp->m_sb.sb_rootino,
- (mp->m_sb.sb_rootino == NULLFSINO ? "(NULLFSINO) ":""),
- first_prealloc_ino);
-
- if (!no_modify)
- do_warn(
- _("resetting superblock root inode pointer to %u\n"),
- first_prealloc_ino);
- else
- do_warn(
- _("would reset superblock root inode pointer to %u\n"),
- first_prealloc_ino);
-
- /*
- * just set the value -- safe since the superblock
- * doesn't get flushed out if no_modify is set
- */
- mp->m_sb.sb_rootino = first_prealloc_ino;
- }
-
- if (mp->m_sb.sb_rbmino != first_prealloc_ino + 1) {
- do_warn(
-_("sb realtime bitmap inode %" PRIu64 " %sinconsistent with calculated value %u\n"),
- mp->m_sb.sb_rbmino,
- (mp->m_sb.sb_rbmino == NULLFSINO ? "(NULLFSINO) ":""),
- first_prealloc_ino + 1);
-
- if (!no_modify)
- do_warn(
- _("resetting superblock realtime bitmap ino pointer to %u\n"),
- first_prealloc_ino + 1);
- else
- do_warn(
- _("would reset superblock realtime bitmap ino pointer to %u\n"),
- first_prealloc_ino + 1);
-
- /*
- * just set the value -- safe since the superblock
- * doesn't get flushed out if no_modify is set
- */
- mp->m_sb.sb_rbmino = first_prealloc_ino + 1;
- }
-
- if (mp->m_sb.sb_rsumino != first_prealloc_ino + 2) {
- do_warn(
-_("sb realtime summary inode %" PRIu64 " %sinconsistent with calculated value %u\n"),
- mp->m_sb.sb_rsumino,
- (mp->m_sb.sb_rsumino == NULLFSINO ? "(NULLFSINO) ":""),
- first_prealloc_ino + 2);
-
- if (!no_modify)
- do_warn(
- _("resetting superblock realtime summary ino pointer to %u\n"),
- first_prealloc_ino + 2);
- else
- do_warn(
- _("would reset superblock realtime summary ino pointer to %u\n"),
- first_prealloc_ino + 2);
-
- /*
- * just set the value -- safe since the superblock
- * doesn't get flushed out if no_modify is set
- */
- mp->m_sb.sb_rsumino = first_prealloc_ino + 2;
- }
-
+ validate_sb_ino(&mp->m_sb.sb_rootino, first_prealloc_ino,
+ _("root"));
+ validate_sb_ino(&mp->m_sb.sb_rbmino, first_prealloc_ino + 1,
+ _("realtime bitmap"));
+ validate_sb_ino(&mp->m_sb.sb_rsumino, first_prealloc_ino + 2,
+ _("realtime summary"));
}
/*
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 ` [PATCH 3/7] xfs_repair: enforce that inode btree chunks can't point to AG headers Darrick J. Wong
2020-02-17 13:51 ` 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 ` Darrick J. Wong [this message]
2020-02-17 13:51 ` [PATCH 4/7] xfs_repair: refactor fixed inode location checks 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=158086362282.2079685.17208024677816310215.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=alex@zadara.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
--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).