From: Darrick J. Wong <djwong@xxxxxxxxxx>
Currently, the XFS_SB_CRC_OFF macro uses the incore superblock struct
(xfs_sb) to compute the address of sb_crc within the ondisk superblock
struct (xfs_dsb). This is a landmine if we ever change the layout of
the incore superblock (as we're about to do), so redefine the macro
to use xfs_dsb to compute the layout of xfs_dsb.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
db/sb.c | 4 ++--
libxfs/xfs_format.h | 9 ++++-----
libxfs/xfs_ondisk.h | 1 +
mdrestore/xfs_mdrestore.c | 6 ++----
repair/agheader.c | 12 ++++++------
5 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/db/sb.c b/db/sb.c
index 9a5d665dfbd..e738065b5be 100644
--- a/db/sb.c
+++ b/db/sb.c
@@ -50,8 +50,8 @@ sb_init(void)
add_command(&version_cmd);
}
-#define OFF(f) bitize(offsetof(xfs_sb_t, sb_ ## f))
-#define SZC(f) szcount(xfs_sb_t, sb_ ## f)
+#define OFF(f) bitize(offsetof(struct xfs_dsb, sb_ ## f))
+#define SZC(f) szcount(struct xfs_dsb, sb_ ## f)
const field_t sb_flds[] = {
{ "magicnum", FLDT_UINT32X, OI(OFF(magicnum)), C1, 0, TYP_NONE },
{ "blocksize", FLDT_UINT32D, OI(OFF(blocksize)), C1, 0, TYP_NONE },
diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index b0aaa825539..c60af436963 100644
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -90,8 +90,7 @@ struct xfs_ifork;
#define XFSLABEL_MAX 12
/*
- * Superblock - in core version. Must match the ondisk version below.
- * Must be padded to 64 bit alignment.
+ * Superblock - in core version. Must be padded to 64 bit alignment.
*/
typedef struct xfs_sb {
uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */
@@ -178,10 +177,8 @@ typedef struct xfs_sb {
/* must be padded to 64 bit alignment */
} xfs_sb_t;
-#define XFS_SB_CRC_OFF offsetof(struct xfs_sb, sb_crc)
-
/*
- * Superblock - on disk version. Must match the in core version above.
+ * Superblock - on disk version.
* Must be padded to 64 bit alignment.
*/
struct xfs_dsb {
@@ -265,6 +262,8 @@ struct xfs_dsb {
/* must be padded to 64 bit alignment */
};
+#define XFS_SB_CRC_OFF offsetof(struct xfs_dsb, sb_crc)
+
/*
* Misc. Flags - warning - these will be cleared by xfs_repair unless
* a feature bit is set when the flag is used.
diff --git a/libxfs/xfs_ondisk.h b/libxfs/xfs_ondisk.h
index bffd39242d4..832d96f0f3c 100644
--- a/libxfs/xfs_ondisk.h
+++ b/libxfs/xfs_ondisk.h
@@ -85,6 +85,7 @@ xfs_check_ondisk_structs(void)
XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_name_remote_t, 12);
*/
+ XFS_CHECK_OFFSET(struct xfs_dsb, sb_crc, 224);
XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, valuelen, 0);
XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, namelen, 2);
XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, nameval, 3);
diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 8e3998db06c..6465a481ce3 100644
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -101,10 +101,8 @@ fixup_superblock(
memset(block_buffer, 0, sb->sb_sectsize);
sb->sb_inprogress = 0;
libxfs_sb_to_disk((struct xfs_dsb *)block_buffer, sb);
- if (xfs_sb_version_hascrc(sb)) {
- xfs_update_cksum(block_buffer, sb->sb_sectsize,
- offsetof(struct xfs_sb, sb_crc));
- }
+ if (xfs_sb_version_hascrc(sb))
+ xfs_update_cksum(block_buffer, sb->sb_sectsize, XFS_SB_CRC_OFF);
if (pwrite(ddev_fd, block_buffer, sb->sb_sectsize, 0) < 0)
fatal("error writing primary superblock: %s\n", strerror(errno));
diff --git a/repair/agheader.c b/repair/agheader.c
index 762901581e1..3930a0ac091 100644
--- a/repair/agheader.c
+++ b/repair/agheader.c
@@ -358,22 +358,22 @@ secondary_sb_whack(
* size is the size of data which is valid for this sb.
*/
if (xfs_sb_version_hasmetauuid(sb))
- size = offsetof(xfs_sb_t, sb_meta_uuid)
+ size = offsetof(struct xfs_dsb, sb_meta_uuid)
+ sizeof(sb->sb_meta_uuid);
else if (xfs_sb_version_hascrc(sb))
- size = offsetof(xfs_sb_t, sb_lsn)
+ size = offsetof(struct xfs_dsb, sb_lsn)
+ sizeof(sb->sb_lsn);
else if (xfs_sb_version_hasmorebits(sb))
- size = offsetof(xfs_sb_t, sb_bad_features2)
+ size = offsetof(struct xfs_dsb, sb_bad_features2)
+ sizeof(sb->sb_bad_features2);
else if (xfs_sb_version_haslogv2(sb))
- size = offsetof(xfs_sb_t, sb_logsunit)
+ size = offsetof(struct xfs_dsb, sb_logsunit)
+ sizeof(sb->sb_logsunit);
else if (xfs_sb_version_hassector(sb))
- size = offsetof(xfs_sb_t, sb_logsectsize)
+ size = offsetof(struct xfs_dsb, sb_logsectsize)
+ sizeof(sb->sb_logsectsize);
else /* only support dirv2 or more recent */
- size = offsetof(xfs_sb_t, sb_dirblklog)
+ size = offsetof(struct xfs_dsb, sb_dirblklog)
+ sizeof(sb->sb_dirblklog);
/* Check the buffer we read from disk for garbage outside size */
