]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
xfs: verify root inode more thoroughly
authorDave Chinner <dchinner@redhat.com>
Tue, 5 Jun 2018 17:09:33 +0000 (10:09 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Wed, 6 Jun 2018 15:10:26 +0000 (08:10 -0700)
When looking up the root inode at mount time, we don't actually do
any verification to check that the inode is allocated and accounted
for correctly in the INOBT. Make the checks on the root inode more
robust by making it an untrusted lookup. This forces the inode
lookup to use the inode btree to verify the inode is allocated
and mapped correctly to disk. This will also have the effect of
catching a significant number of AGI/INOBT related corruptions in
AG 0 at mount time.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
fs/xfs/xfs_mount.c

index 73ed8fec0328c42d79b82466660cb126c4d1dc87..8c564de1a2bcbe97eaa98c62c967dd230becfeba 100644 (file)
@@ -874,9 +874,12 @@ xfs_mountfs(
         * Get and sanity-check the root inode.
         * Save the pointer to it in the mount structure.
         */
-       error = xfs_iget(mp, NULL, sbp->sb_rootino, 0, XFS_ILOCK_EXCL, &rip);
+       error = xfs_iget(mp, NULL, sbp->sb_rootino, XFS_IGET_UNTRUSTED,
+                        XFS_ILOCK_EXCL, &rip);
        if (error) {
-               xfs_warn(mp, "failed to read root inode");
+               xfs_warn(mp,
+                       "Failed to read root inode 0x%llx, error %d",
+                       sbp->sb_rootino, -error);
                goto out_log_dealloc;
        }