xfs
[Top] [All Lists]

[PATCH 08/24] xfs: scrub the AGI

To: david@xxxxxxxxxxxxx, darrick.wong@xxxxxxxxxx
Subject: [PATCH 08/24] xfs: scrub the AGI
From: "Darrick J. Wong" <darrick.wong@xxxxxxxxxx>
Date: Thu, 25 Aug 2016 16:56:09 -0700
Cc: linux-xfs@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <147216931783.6398.1716678878794493264.stgit@xxxxxxxxxxxxxxxx>
References: <147216931783.6398.1716678878794493264.stgit@xxxxxxxxxxxxxxxx>
User-agent: StGit/0.17.1-dirty
Add a forgotten check to the AGI verifier, then wire up the scrub
infrastructure to check the AGI contents.

Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
 libxfs/xfs_fs.h     |    3 ++-
 libxfs/xfs_ialloc.c |    5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)


diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
index dbdd346..daf8f5d 100644
--- a/libxfs/xfs_fs.h
+++ b/libxfs/xfs_fs.h
@@ -562,7 +562,8 @@ struct xfs_scrub_metadata {
 #define XFS_SCRUB_TYPE_SB      0       /* superblock */
 #define XFS_SCRUB_TYPE_AGF     1       /* AG free header */
 #define XFS_SCRUB_TYPE_AGFL    2       /* AG free list */
-#define XFS_SCRUB_TYPE_MAX     2
+#define XFS_SCRUB_TYPE_AGI     3       /* AG inode header */
+#define XFS_SCRUB_TYPE_MAX     3
 
 #define XFS_SCRUB_FLAGS_ALL    0x0     /* no flags yet */
 
diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 5c88b0b..c533d5c 100644
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -2508,6 +2508,11 @@ xfs_agi_verify(
 
        if (be32_to_cpu(agi->agi_level) > XFS_BTREE_MAXLEVELS)
                return false;
+
+       if (xfs_sb_version_hasfinobt(&mp->m_sb) &&
+           be32_to_cpu(agi->agi_free_level) > XFS_BTREE_MAXLEVELS)
+               return false;
+
        /*
         * during growfs operations, the perag is not fully initialised,
         * so we can't use it for any useful checking. growfs ensures we can't

<Prev in Thread] Current Thread [Next in Thread>