From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: sandeen@sandeen.net, linux-xfs@vger.kernel.org, alex@zadara.com
Subject: Re: [PATCH 4/6] xfs_repair: refactor fixed inode location checks
Date: Thu, 5 Dec 2019 09:37:50 -0500 [thread overview]
Message-ID: <20191205143750.GD48368@bfoster> (raw)
In-Reply-To: <157547908997.974712.1071264960710221462.stgit@magnolia>
On Wed, Dec 04, 2019 at 09:04:50AM -0800, Darrick J. Wong wrote:
> 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: Brian Foster <bfoster@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..94673750 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
> +ensure_fixed_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;
> - }
> -
> + ensure_fixed_ino(&mp->m_sb.sb_rootino, first_prealloc_ino,
> + _("root"));
> + ensure_fixed_ino(&mp->m_sb.sb_rbmino, first_prealloc_ino + 1,
> + _("realtime bitmap"));
> + ensure_fixed_ino(&mp->m_sb.sb_rsumino, first_prealloc_ino + 2,
> + _("realtime summary"));
> }
>
> /*
>
next prev parent reply other threads:[~2019-12-05 14:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 17:04 [PATCH v2 0/6] xfs_repair: do not trash valid root dirs Darrick J. Wong
2019-12-04 17:04 ` [PATCH 1/6] xfs: don't commit sunit/swidth updates to disk if that would cause repair failures Darrick J. Wong
2019-12-04 17:04 ` [PATCH 2/6] mkfs: check root inode location Darrick J. Wong
2019-12-05 14:36 ` Brian Foster
2019-12-04 17:04 ` [PATCH 3/6] xfs_repair: enforce that inode btree chunks can't point to AG headers Darrick J. Wong
2019-12-05 14:37 ` Brian Foster
2019-12-05 16:28 ` Darrick J. Wong
2019-12-06 16:00 ` Brian Foster
2019-12-12 19:11 ` Eric Sandeen
2019-12-12 20:38 ` Eric Sandeen
2019-12-12 22:10 ` Darrick J. Wong
2019-12-04 17:04 ` [PATCH 4/6] xfs_repair: refactor fixed inode location checks Darrick J. Wong
2019-12-05 14:37 ` Brian Foster [this message]
2019-12-04 17:04 ` [PATCH 5/6] xfs_repair: use libxfs function to calculate root inode location Darrick J. Wong
2019-12-05 14:37 ` Brian Foster
2019-12-04 17:05 ` [PATCH 6/6] xfs_repair: check plausibility of root dir pointer before trashing it Darrick J. Wong
2019-12-05 14:38 ` Brian Foster
2019-12-12 22:46 ` [PATCH 6/6] xfs_repair: check plausibility of root dir pointer before trashing it\ Darrick J. Wong
2019-12-13 11:19 ` Brian Foster
2019-12-16 16:34 ` Darrick J. Wong
2019-12-17 11:32 ` Brian Foster
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=20191205143750.GD48368@bfoster \
--to=bfoster@redhat.com \
--cc=alex@zadara.com \
--cc=darrick.wong@oracle.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).