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 4/4] xfs_repair: check plausiblitiy of root dir pointer
Date: Mon, 02 Dec 2019 09:36:25 -0800 [thread overview]
Message-ID: <157530818573.126767.13434243816626977089.stgit@magnolia> (raw)
In-Reply-To: <157530815855.126767.7523979488668040754.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
If sb_rootino doesn't point to where we think mkfs was supposed to have
preallocated an inode chunk, check to see if the alleged root directory
actually looks like a root directory. If so, we'll let it go because
someone could have changed sunit since formatting time.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
repair/xfs_repair.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 6798b88c..f6134cca 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -395,12 +395,60 @@ do_log(char const *msg, ...)
va_end(args);
}
+/*
+ * If sb_rootino points to a different inode than we were expecting, try
+ * loading the alleged root inode to see if it's a plausibly a root directory.
+ * If so, we'll readjust the computations.
+ */
+static void
+check_misaligned_root(
+ struct xfs_mount *mp)
+{
+ struct xfs_inode *ip;
+ xfs_ino_t ino;
+ int error;
+
+ error = -libxfs_iget(mp, NULL, mp->m_sb.sb_rootino, 0, &ip,
+ &xfs_default_ifork_ops);
+ if (error)
+ return;
+ if (!S_ISDIR(VFS_I(ip)->i_mode))
+ goto out_rele;
+
+ error = -libxfs_dir_lookup(NULL, ip, &xfs_name_dotdot, &ino, NULL);
+ if (error)
+ goto out_rele;
+
+ if (ino == mp->m_sb.sb_rootino) {
+ do_warn(
+_("sb root inode value %" PRIu64 " inconsistent with calculated value %u but looks like a root directory\n"),
+ mp->m_sb.sb_rootino, first_prealloc_ino);
+ last_prealloc_ino += (int)ino - first_prealloc_ino;
+ first_prealloc_ino = ino;
+ }
+
+out_rele:
+ libxfs_irele(ip);
+}
+
static void
-calc_mkfs(xfs_mount_t *mp)
+calc_mkfs(
+ struct xfs_mount *mp)
{
libxfs_ialloc_find_prealloc(mp, &first_prealloc_ino,
&last_prealloc_ino);
+ /*
+ * If the root inode isn't where we think it is, check its plausibility
+ * as a root directory. It's possible that somebody changed sunit since
+ * the filesystem was created, which can change the value of the above
+ * computation. Try to avoid blowing up the filesystem if this is the
+ * case.
+ */
+ if (mp->m_sb.sb_rootino != NULLFSINO &&
+ mp->m_sb.sb_rootino != first_prealloc_ino)
+ check_misaligned_root(mp);
+
/*
* now the first 3 inodes in the system
*/
next prev parent reply other threads:[~2019-12-02 17:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 17:35 [PATCH RFC 0/4] xfs_repair: do not trash valid root dirs Darrick J. Wong
2019-12-02 17:36 ` [PATCH 1/4] xfs: don't commit sunit/swidth updates to disk if that would cause repair failures Darrick J. Wong
2019-12-02 17:36 ` [PATCH 2/4] mkfs: check root inode location Darrick J. Wong
2019-12-03 13:02 ` Brian Foster
2019-12-03 23:40 ` Darrick J. Wong
2019-12-04 11:51 ` Brian Foster
2019-12-02 17:36 ` [PATCH 3/4] xfs_repair: use xfs_ialloc_find_prealloc Darrick J. Wong
2019-12-02 17:36 ` Darrick J. Wong [this message]
2019-12-03 13:03 ` [PATCH 4/4] xfs_repair: check plausiblitiy of root dir pointer Brian Foster
2019-12-04 0:11 ` 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=157530818573.126767.13434243816626977089.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).