[PATCH 20/32] FIXUP

[Christoph Hellwig <hch@lst.de>]

---
 libxfs/stubs/xfs_mount.h |  7 +++++++
 repair/agheader.h        |  6 ++++++
 repair/sb.c              | 13 +++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/libxfs/stubs/xfs_mount.h b/libxfs/stubs/xfs_mount.h
index 5a714333c16e..838746fa16d8 100644
--- a/libxfs/stubs/xfs_mount.h
+++ b/libxfs/stubs/xfs_mount.h
@@ -111,6 +111,8 @@ typedef struct xfs_mount {
 	uint8_t			m_sectbb_log;	/* sectorlog - BBSHIFT */
 	uint8_t			m_agno_log;	/* log #ag's */
 	int8_t			m_rtxblklog;	/* log2 of rextsize, if possible */
+	uint8_t			m_rtcsum_shift;	/* log2 of RT data csum size */
+	uint32_t		m_rtcsum_bsize;	/* rtcsum block size in bytes */
 
 	uint			m_blockmask;	/* sb_blocksize-1 */
 	uint			m_blockwsize;	/* sb_blocksize in words */
@@ -272,6 +274,11 @@ __XFS_HAS_FEAT(exchange_range, EXCHANGE_RANGE)
 __XFS_HAS_FEAT(metadir, METADIR)
 __XFS_HAS_FEAT(zoned, ZONED)
 
+static inline bool xfs_has_rtcsum(const struct xfs_mount *mp)
+{
+	return mp->m_sb.sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_RTCSUM;
+}
+
 static inline bool xfs_has_rtgroups(const struct xfs_mount *mp)
 {
 	/* all metadir file systems also allow rtgroups */
diff --git a/repair/agheader.h b/repair/agheader.h
index c81147b6607d..e11d13f620bf 100644
--- a/repair/agheader.h
+++ b/repair/agheader.h
@@ -91,4 +91,10 @@ static inline bool xfs_sb_version_hasmetadir(const struct xfs_sb *sbp)
 		(sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR);
 }
 
+static inline bool xfs_sb_version_rtcsum(const struct xfs_sb *sbp)
+{
+	return xfs_sb_is_v5(sbp) &&
+		(sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_RTCSUM);
+}
+
 #endif /* __XFS_REPAIR_AGHEADER_H__ */
diff --git a/repair/sb.c b/repair/sb.c
index ee1cc63fae64..73562c3d061a 100644
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -523,6 +523,19 @@ verify_sb(char *sb_buf, xfs_sb_t *sb, int is_primary_sb)
 		ret = verify_sb_rtgroups(sb);
 		if (ret)
 			return ret;
+
+		if (xfs_sb_version_rtcsum(sb)) {
+			if (sb->sb_rtcsum_type >= XFS_CSUM_TYPE_MAX)
+				return XR_SB_GEO_MISMATCH;
+			if (sb->sb_rtcsum_blklog < XFS_RTCSUM_BSIZE_LOG_MIN ||
+			    sb->sb_rtcsum_blklog > XFS_RTCSUM_BSIZE_LOG_MAX)
+				return XR_SB_GEO_MISMATCH;
+		} else {
+			if (sb->sb_rtcsum_type)
+				return XR_SB_GEO_MISMATCH;
+			if (sb->sb_rtcsum_blklog)
+				return XR_SB_GEO_MISMATCH;
+		}
 	}
 
 	return(XR_OK);
-- 
2.53.0