[PATCH] xfs: port xfs/122 to the kernel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

From: Darrick J. Wong <djwong@xxxxxxxxxx>

Check this with every kernel and userspace build, so we can drop the
nonsense in xfs/122.  Roughly drafted with:

sed -e 's/^offsetof/\tXFS_CHECK_OFFSET/g' \
	-e 's/^sizeof/\tXFS_CHECK_STRUCT_SIZE/g' \
	-e 's/ = \([0-9]*\)/,\t\t\t\1);/g' \
	-e 's/xfs_sb_t/struct xfs_dsb/g' \
	-e 's/),/,/g' \
	-e 's/xfs_\([a-z0-9_]*\)_t,/struct xfs_\1,/g' \
	< tests/xfs/122.out | sort

and then manual fixups.

Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
 fs/xfs/libxfs/xfs_ondisk.h |  111 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/libxfs/xfs_ondisk.h b/fs/xfs/libxfs/xfs_ondisk.h
index 23c133fd36f5bb..89d9139394c466 100644
--- a/fs/xfs/libxfs/xfs_ondisk.h
+++ b/fs/xfs/libxfs/xfs_ondisk.h
@@ -19,6 +19,10 @@
 	static_assert((value) == (expected), \
 		"XFS: value of " #value " is wrong, expected " #expected)
 
+#define XFS_CHECK_SB_OFFSET(field, offset) \
+	XFS_CHECK_OFFSET(struct xfs_dsb, field, offset); \
+	XFS_CHECK_OFFSET(struct xfs_sb, field, offset);
+
 static inline void __init
 xfs_check_ondisk_structs(void)
 {
@@ -85,7 +89,6 @@ 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);
@@ -201,6 +204,112 @@ xfs_check_ondisk_structs(void)
 	XFS_CHECK_VALUE(XFS_DQ_BIGTIME_EXPIRY_MIN << XFS_DQ_BIGTIME_SHIFT, 4);
 	XFS_CHECK_VALUE(XFS_DQ_BIGTIME_EXPIRY_MAX << XFS_DQ_BIGTIME_SHIFT,
 			16299260424LL);
+
+	/* stuff we got from xfs/122 */
+	XFS_CHECK_SB_OFFSET(sb_agblklog,		124);
+	XFS_CHECK_SB_OFFSET(sb_agblocks,		84);
+	XFS_CHECK_SB_OFFSET(sb_agcount,			88);
+	XFS_CHECK_SB_OFFSET(sb_bad_features2,		204);
+	XFS_CHECK_SB_OFFSET(sb_blocklog,		120);
+	XFS_CHECK_SB_OFFSET(sb_blocksize,		4);
+	XFS_CHECK_SB_OFFSET(sb_crc,			224);
+	XFS_CHECK_SB_OFFSET(sb_dblocks,			8);
+	XFS_CHECK_SB_OFFSET(sb_dirblklog,		192);
+	XFS_CHECK_SB_OFFSET(sb_fdblocks,		144);
+	XFS_CHECK_SB_OFFSET(sb_features2,		200);
+	XFS_CHECK_SB_OFFSET(sb_features_compat,		208);
+	XFS_CHECK_SB_OFFSET(sb_features_incompat,	216);
+	XFS_CHECK_SB_OFFSET(sb_features_log_incompat,	220);
+	XFS_CHECK_SB_OFFSET(sb_features_ro_compat,	212);
+	XFS_CHECK_SB_OFFSET(sb_flags,			178);
+	XFS_CHECK_SB_OFFSET(sb_fname[12],		120);
+	XFS_CHECK_SB_OFFSET(sb_frextents,		152);
+	XFS_CHECK_SB_OFFSET(sb_gquotino,		168);
+	XFS_CHECK_SB_OFFSET(sb_icount,			128);
+	XFS_CHECK_SB_OFFSET(sb_ifree,			136);
+	XFS_CHECK_SB_OFFSET(sb_imax_pct,		127);
+	XFS_CHECK_SB_OFFSET(sb_inoalignmt,		180);
+	XFS_CHECK_SB_OFFSET(sb_inodelog,		122);
+	XFS_CHECK_SB_OFFSET(sb_inodesize,		104);
+	XFS_CHECK_SB_OFFSET(sb_inopblock,		106);
+	XFS_CHECK_SB_OFFSET(sb_inopblog,		123);
+	XFS_CHECK_SB_OFFSET(sb_inprogress,		126);
+	XFS_CHECK_SB_OFFSET(sb_logblocks,		96);
+	XFS_CHECK_SB_OFFSET(sb_logsectlog,		193);
+	XFS_CHECK_SB_OFFSET(sb_logsectsize,		194);
+	XFS_CHECK_SB_OFFSET(sb_logstart,		48);
+	XFS_CHECK_SB_OFFSET(sb_logsunit,		196);
+	XFS_CHECK_SB_OFFSET(sb_lsn,			240);
+	XFS_CHECK_SB_OFFSET(sb_magicnum,		0);
+	XFS_CHECK_SB_OFFSET(sb_meta_uuid,		248);
+	XFS_CHECK_SB_OFFSET(sb_pquotino,		232);
+	XFS_CHECK_SB_OFFSET(sb_qflags,			176);
+	XFS_CHECK_SB_OFFSET(sb_rblocks,			16);
+	XFS_CHECK_SB_OFFSET(sb_rbmblocks,		92);
+	XFS_CHECK_SB_OFFSET(sb_rbmino,			64);
+	XFS_CHECK_SB_OFFSET(sb_rextents,		24);
+	XFS_CHECK_SB_OFFSET(sb_rextsize,		80);
+	XFS_CHECK_SB_OFFSET(sb_rextslog,		125);
+	XFS_CHECK_SB_OFFSET(sb_rootino,			56);
+	XFS_CHECK_SB_OFFSET(sb_rsumino,			72);
+	XFS_CHECK_SB_OFFSET(sb_sectlog,			121);
+	XFS_CHECK_SB_OFFSET(sb_sectsize,		102);
+	XFS_CHECK_SB_OFFSET(sb_shared_vn,		179);
+	XFS_CHECK_SB_OFFSET(sb_spino_align,		228);
+	XFS_CHECK_SB_OFFSET(sb_unit,			184);
+	XFS_CHECK_SB_OFFSET(sb_uquotino,		160);
+	XFS_CHECK_SB_OFFSET(sb_uuid,			32);
+	XFS_CHECK_SB_OFFSET(sb_versionnum,		100);
+	XFS_CHECK_SB_OFFSET(sb_width,			188);
+
+	XFS_CHECK_STRUCT_SIZE(struct xfs_ag_geometry,			128);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_alloc_rec,			8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_alloc_rec_incore,		8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_entry,		8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_hdr,			32);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_map,			4);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_local,		4);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_remote,		12);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_attrlist_cursor,		16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_attr_sf_entry,			3);
+	XFS_CHECK_STRUCT_SIZE(xfs_bmdr_key_t,				8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_bulk_ireq,			64);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_commit_range,			88);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_da_blkinfo,			12);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_da_intnode,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_entry,			8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_hdr,			16);
+	XFS_CHECK_STRUCT_SIZE(enum xfs_dinode_fmt,			4);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_free,		4);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_hdr,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_unused,		6);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free_hdr,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_entry,		8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_hdr,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_tail,		4);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_entry,			3);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_hdr,			10);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_error_injection,		8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_exchange_range,		40);
+	XFS_CHECK_STRUCT_SIZE(xfs_exntst_t,				4);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fid,				16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fs_eofblocks,			128);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fsid,				8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_counts,			32);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_geom,			256);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_geom_v1,			112);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_geom_v4,			112);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_fsop_resblks,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_growfs_log,			8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_handle,			24);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_metadata,		64);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec,			16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_scrub_vec_head,		40);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_unmount_log_format,		8);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_xmd_log_format,		16);
+	XFS_CHECK_STRUCT_SIZE(struct xfs_xmi_log_format,		88);
 }
 
 #endif /* __XFS_ONDISK_H */
[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]

  Powered by Linux