Whamcloud - gitweb
LU-389 update wirecheck for master
authorFan Yong <yong.fan@whamcloud.com>
Thu, 27 Oct 2011 17:46:32 +0000 (01:46 +0800)
committerOleg Drokin <green@whamcloud.com>
Fri, 4 Nov 2011 03:59:20 +0000 (23:59 -0400)
Drop unused mds_body/mds_remote_perm definition and wirecheck.
Add missing wirecheck for mdt_xxx, ost_xxx, lu_xxx, and so on.

Signed-off-by: Fan Yong <yong.fan@whamcloud.com>
Change-Id: I858a02b0b5de8680cc8315e38aeeca271c26e9ad
Reviewed-on: http://review.whamcloud.com/985
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
17 files changed:
lustre/include/lustre/lustre_idl.h
lustre/include/lustre/lustre_user.h
lustre/include/lustre_net.h
lustre/include/obd.h
lustre/include/obd_class.h
lustre/ldlm/ldlm_lib.c
lustre/mdt/mdt_open.c
lustre/mdt/mdt_reint.c
lustre/obdfilter/filter.c
lustre/ost/ost_handler.c
lustre/ptlrpc/pack_generic.c
lustre/ptlrpc/ptlrpc_module.c
lustre/ptlrpc/wiretest.c
lustre/utils/llog_reader.c
lustre/utils/req-layout.c
lustre/utils/wirecheck.c
lustre/utils/wiretest.c

index 5e91b63..01bd83b 100644 (file)
@@ -1386,23 +1386,22 @@ struct lov_mds_md_v3 {            /* LOV EA mds/wire data (little-endian) */
 #define OBD_MD_MEA         (0x0000000400000000ULL) /* CMD split EA  */
 #define OBD_MD_MDTIDX      (0x0000000800000000ULL) /* Get MDT index  */
 
-#define OBD_MD_FLXATTR     (0x0000001000000000ULL) /* xattr */
-#define OBD_MD_FLXATTRLS   (0x0000002000000000ULL) /* xattr list */
-#define OBD_MD_FLXATTRRM   (0x0000004000000000ULL) /* xattr remove */
-#define OBD_MD_FLACL       (0x0000008000000000ULL) /* ACL */
-#define OBD_MD_FLRMTPERM   (0x0000010000000000ULL) /* remote permission */
-#define OBD_MD_FLMDSCAPA   (0x0000020000000000ULL) /* MDS capability */
-#define OBD_MD_FLOSSCAPA   (0x0000040000000000ULL) /* OSS capability */
-#define OBD_MD_FLCKSPLIT   (0x0000080000000000ULL) /* Check split on server */
-#define OBD_MD_FLCROSSREF  (0x0000100000000000ULL) /* Cross-ref case */
+#define OBD_MD_FLXATTR       (0x0000001000000000ULL) /* xattr */
+#define OBD_MD_FLXATTRLS     (0x0000002000000000ULL) /* xattr list */
+#define OBD_MD_FLXATTRRM     (0x0000004000000000ULL) /* xattr remove */
+#define OBD_MD_FLACL         (0x0000008000000000ULL) /* ACL */
+#define OBD_MD_FLRMTPERM     (0x0000010000000000ULL) /* remote permission */
+#define OBD_MD_FLMDSCAPA     (0x0000020000000000ULL) /* MDS capability */
+#define OBD_MD_FLOSSCAPA     (0x0000040000000000ULL) /* OSS capability */
+#define OBD_MD_FLCKSPLIT     (0x0000080000000000ULL) /* Check split on server */
+#define OBD_MD_FLCROSSREF    (0x0000100000000000ULL) /* Cross-ref case */
 #define OBD_MD_FLGETATTRLOCK (0x0000200000000000ULL) /* Get IOEpoch attributes
                                                       * under lock */
-#define OBD_FL_TRUNC       (0x0000200000000000ULL) /* for filter_truncate */
 
-#define OBD_MD_FLRMTLSETFACL    (0x0001000000000000ULL) /* lfs lsetfacl case */
-#define OBD_MD_FLRMTLGETFACL    (0x0002000000000000ULL) /* lfs lgetfacl case */
-#define OBD_MD_FLRMTRSETFACL    (0x0004000000000000ULL) /* lfs rsetfacl case */
-#define OBD_MD_FLRMTRGETFACL    (0x0008000000000000ULL) /* lfs rgetfacl case */
+#define OBD_MD_FLRMTLSETFACL (0x0001000000000000ULL) /* lfs lsetfacl case */
+#define OBD_MD_FLRMTLGETFACL (0x0002000000000000ULL) /* lfs lgetfacl case */
+#define OBD_MD_FLRMTRSETFACL (0x0004000000000000ULL) /* lfs rsetfacl case */
+#define OBD_MD_FLRMTRGETFACL (0x0008000000000000ULL) /* lfs rgetfacl case */
 
 #define OBD_MD_FLGETATTR (OBD_MD_FLID    | OBD_MD_FLATIME | OBD_MD_FLMTIME | \
                           OBD_MD_FLCTIME | OBD_MD_FLSIZE  | OBD_MD_FLBLKSZ | \
@@ -1415,16 +1414,6 @@ struct lov_mds_md_v3 {            /* LOV EA mds/wire data (little-endian) */
 
 
 extern void lustre_swab_obd_statfs (struct obd_statfs *os);
-#define OBD_STATFS_NODELAY      0x0001  /* requests should be send without delay
-                                         * and resends for avoid deadlocks */
-#define OBD_STATFS_FROM_CACHE   0x0002  /* the statfs callback should not update
-                                         * obd_osfs_age */
-#define OBD_STATFS_PTLRPCD      0x0004  /* requests will be sent via ptlrpcd
-                                         * instead of a specific set. This
-                                         * means that we cannot rely on the set
-                                         * interpret routine to be called.
-                                         * lov_statfs_fini() must thus be called
-                                         * by the request interpret routine */
 
 /* ost_body.data values for OST_BRW */
 
@@ -1566,13 +1555,6 @@ extern void lustre_swab_ll_fid (struct ll_fid *fid);
 #define MDS_STATUS_CONN 1
 #define MDS_STATUS_LOV 2
 
-struct mds_status_req {
-        __u32  flags;
-        __u32  repbuf;
-};
-
-extern void lustre_swab_mds_status_req (struct mds_status_req *r);
-
 /* mdt_thread_info.mti_flags. */
 enum md_op_flags {
         /* The flag indicates Size-on-MDS attributes are changed. */
@@ -1632,48 +1614,6 @@ static inline int ll_inode_to_ext_flags(int iflags)
 }
 #endif
 
-/*
- * while mds_body is to interact with 1.6, mdt_body is to interact with 2.0.
- * both of them should have the same fields layout, because at client side
- * one could be dynamically cast to the other.
- *
- * mdt_body has large size than mds_body, with unused padding (48 bytes)
- * at the end. client always use size of mdt_body to prepare request/reply
- * buffers, and actual data could be interepeted as mdt_body or mds_body
- * accordingly.
- */
-struct mds_body {
-        struct ll_fid  fid1;
-        struct ll_fid  fid2;
-        struct lustre_handle handle;
-        __u64          valid;
-        __u64          size;   /* Offset, in the case of MDS_READPAGE */
-        obd_time       mtime;
-        obd_time       atime;
-        obd_time       ctime;
-        __u64          blocks; /* XID, in the case of MDS_READPAGE */
-        __u64          io_epoch;
-        __u64          ino;
-        __u32          fsuid;
-        __u32          fsgid;
-        __u32          capability;
-        __u32          mode;
-        __u32          uid;
-        __u32          gid;
-        __u32          flags; /* from vfs for pin/unpin, MDS_BFLAG for close */
-        __u32          rdev;
-        __u32          nlink; /* #bytes to read in the case of MDS_READPAGE */
-        __u32          generation;
-        __u32          suppgid;
-        __u32          eadatasize;
-        __u32          aclsize;
-        __u32          max_mdsize;
-        __u32          max_cookiesize;
-        __u32          padding_4; /* also fix lustre_swab_mds_body */
-};
-
-extern void lustre_swab_mds_body (struct mds_body *b);
-
 struct mdt_body {
         struct lu_fid  fid1;
         struct lu_fid  fid2;
@@ -1685,7 +1625,7 @@ struct mdt_body {
        obd_time        ctime;
         __u64          blocks; /* XID, in the case of MDS_READPAGE */
         __u64          ioepoch;
-        __u64          ino;    /* for 1.6 compatibility */
+        __u64          ino;
         __u32          fsuid;
         __u32          fsgid;
         __u32          capability;
@@ -1695,7 +1635,7 @@ struct mdt_body {
         __u32          flags; /* from vfs for pin/unpin, MDS_BFLAG for close */
         __u32          rdev;
         __u32          nlink; /* #bytes to read in the case of MDS_READPAGE */
-        __u32          generation; /* for 1.6 compatibility */
+        __u32          generation;
         __u32          suppgid;
         __u32          eadatasize;
         __u32          aclsize;
@@ -1777,7 +1717,7 @@ extern void lustre_swab_quota_adjust_qunit(struct quota_adjust_qunit *q);
 #define LQUOTA_FLAGS_SETQUOTA 64UL   /* being setquota on a uid/gid */
 
 /* flags is specific for quota_adjust_qunit */
-#define LQUOTA_QAQ_CREATE_LQS  (1 << 31) /* when it is set, need create lqs */
+#define LQUOTA_QAQ_CREATE_LQS  (1UL << 31) /* when it is set, need create lqs */
 
 /* the status of lqs_flags in struct lustre_qunit_size  */
 #define LQUOTA_QUNIT_FLAGS (LQUOTA_FLAGS_GRP | LQUOTA_FLAGS_BLK)
@@ -1792,16 +1732,6 @@ extern void lustre_swab_quota_adjust_qunit(struct quota_adjust_qunit *q);
 #define QAQ_SET_ADJINO(qaq) ((qaq)->qaq_flags |= LQUOTA_FLAGS_ADJINO)
 #define QAQ_SET_CREATE_LQS(qaq) ((qaq)->qaq_flags |= LQUOTA_QAQ_CREATE_LQS)
 
-/* inode access permission for remote user, the inode info are omitted,
- * for client knows them. */
-struct mds_remote_perm {
-        __u32           rp_uid;
-        __u32           rp_gid;
-        __u32           rp_fsuid;
-        __u32           rp_fsgid;
-        __u32           rp_access_perm; /* MAY_READ/WRITE/EXEC */
-};
-
 /* permissions for md_perm.mp_perm */
 enum {
         CFS_SETUID_PERM = 0x01,
@@ -1811,8 +1741,8 @@ enum {
         CFS_RMTOWN_PERM = 0x10
 };
 
-extern void lustre_swab_mds_remote_perm(struct mds_remote_perm *p);
-
+/* inode access permission for remote user, the inode info are omitted,
+ * for client knows them. */
 struct mdt_remote_perm {
         __u32           rp_uid;
         __u32           rp_gid;
@@ -1821,6 +1751,7 @@ struct mdt_remote_perm {
         __u32           rp_fsgid;
         __u32           rp_fsgid_h;
         __u32           rp_access_perm; /* MAY_READ/WRITE/EXEC */
+        __u32           rp_padding;
 };
 
 extern void lustre_swab_mdt_remote_perm(struct mdt_remote_perm *p);
@@ -1883,18 +1814,18 @@ extern void lustre_swab_mdt_rec_setattr (struct mdt_rec_setattr *sa);
 #define FMODE_WRITE              00000002
 #endif
 
+#define MDS_FMODE_CLOSED         00000000
+#define MDS_FMODE_EXEC           00000004
 /* IO Epoch is opened on a closed file. */
-#define FMODE_EPOCH              01000000
+#define MDS_FMODE_EPOCH          01000000
 /* IO Epoch is opened on a file truncate. */
-#define FMODE_TRUNC              02000000
+#define MDS_FMODE_TRUNC          02000000
 /* Size-on-MDS Attribute Update is pending. */
-#define FMODE_SOM                04000000
-#define FMODE_CLOSED             0
+#define MDS_FMODE_SOM            04000000
 
 #define MDS_OPEN_CREATED         00000010
 #define MDS_OPEN_CROSS           00000020
 
-#define MDS_FMODE_EXEC           00000004
 #define MDS_OPEN_CREAT           00000100
 #define MDS_OPEN_EXCL            00000200
 #define MDS_OPEN_TRUNC           00001000
@@ -2173,13 +2104,6 @@ extern void lustre_swab_lmv_stripe_md(struct lmv_stripe_md *mea);
 #define MAX_HASH_SIZE            0x7fffffffffffffffULL
 #define MAX_HASH_HIGHEST_BIT     0x1000000000000000ULL
 
-struct md_fld {
-        seqno_t mf_seq;
-        mdsno_t mf_mds;
-};
-
-extern void lustre_swab_md_fld (struct md_fld *mf);
-
 enum fld_rpc_opc {
         FLD_QUERY                       = 900,
         FLD_LAST_OPC,
@@ -2460,7 +2384,7 @@ struct cfg_marker {
         __u32             cm_step;       /* aka config version */
         __u32             cm_flags;
         __u32             cm_vers;       /* lustre release version number */
-        __u32             padding;       /* 64 bit align */
+        __u32             cm_padding;    /* 64 bit align */
         obd_time          cm_createtime; /*when this record was first created */
         obd_time          cm_canceltime; /*when this record is no longer valid*/
         char              cm_tgtname[MTI_NAME_MAXLEN];
@@ -2540,7 +2464,7 @@ struct llog_rec_hdr {
         __u32                   lrh_len;
         __u32                   lrh_index;
         __u32                   lrh_type;
-        __u32                   padding;
+        __u32                   lrh_padding;
 };
 
 struct llog_rec_tail {
@@ -2551,11 +2475,11 @@ struct llog_rec_tail {
 struct llog_logid_rec {
         struct llog_rec_hdr     lid_hdr;
         struct llog_logid       lid_id;
-        __u32                   padding1;
-        __u32                   padding2;
-        __u32                   padding3;
-        __u32                   padding4;
-        __u32                   padding5;
+        __u32                   lid_padding1;
+        __u32                   lid_padding2;
+        __u32                   lid_padding3;
+        __u32                   lid_padding4;
+        __u32                   lid_padding5;
         struct llog_rec_tail    lid_tail;
 } __attribute__((packed));
 
@@ -2564,7 +2488,7 @@ struct llog_create_rec {
         struct ll_fid           lcr_fid;
         obd_id                  lcr_oid;
         obd_count               lcr_oseq;
-        __u32                   padding;
+        __u32                   lcr_padding;
         struct llog_rec_tail    lcr_tail;
 } __attribute__((packed));
 
@@ -2572,7 +2496,7 @@ struct llog_orphan_rec {
         struct llog_rec_hdr     lor_hdr;
         obd_id                  lor_oid;
         obd_count               lor_ogen;
-        __u32                   padding;
+        __u32                   lor_padding;
         struct llog_rec_tail    lor_tail;
 } __attribute__((packed));
 
@@ -2590,7 +2514,7 @@ struct llog_setattr_rec {
         obd_count               lsr_oseq;
         __u32                   lsr_uid;
         __u32                   lsr_gid;
-        __u32                   padding;
+        __u32                   lsr_padding;
         struct llog_rec_tail    lsr_tail;
 } __attribute__((packed));
 
@@ -2598,7 +2522,7 @@ struct llog_setattr64_rec {
         struct llog_rec_hdr     lsr_hdr;
         obd_id                  lsr_oid;
         obd_count               lsr_oseq;
-        __u32                   padding;
+        __u32                   lsr_padding;
         __u32                   lsr_uid;
         __u32                   lsr_uid_h;
         __u32                   lsr_gid;
@@ -2610,7 +2534,7 @@ struct llog_size_change_rec {
         struct llog_rec_hdr     lsc_hdr;
         struct ll_fid           lsc_fid;
         __u32                   lsc_ioepoch;
-        __u32                   padding;
+        __u32                   lsc_padding;
         struct llog_rec_tail    lsc_tail;
 } __attribute__((packed));
 
index d6d304f..eab9d3c 100644 (file)
@@ -30,6 +30,9 @@
  * Use is subject to license terms.
  */
 /*
+ * Copyright (c) 2011 Whamcloud, Inc.
+ */
+/*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
@@ -449,7 +452,7 @@ struct obd_dqblk {
         __u64 dqb_btime;
         __u64 dqb_itime;
         __u32 dqb_valid;
-        __u32 padding;
+        __u32 dqb_padding;
 };
 
 enum {
index 50c3077..88edc1c 100644 (file)
  * open:     FNAME_MAX + EA_MAX
  *
  * MDS_MAXREQSIZE ~= 4736 bytes =
- * lustre_msg + ldlm_request + mds_body + mds_rec_create + FNAME_MAX + PATH_MAX
+ * lustre_msg + ldlm_request + mdt_body + mds_rec_create + FNAME_MAX + PATH_MAX
  * MDS_MAXREPSIZE ~= 8300 bytes = lustre_msg + llog_header
  * or, for mds_close() and mds_reint_unlink() on a many-OST filesystem:
- *      = 9210 bytes = lustre_msg + mds_body + 160 * (easize + cookiesize)
+ *      = 9210 bytes = lustre_msg + mdt_body + 160 * (easize + cookiesize)
  *
  * Realistic size is about 512 bytes (20 character name + 128 char symlink),
  * except in the open case where there are a large number of OSTs in a LOV.
 #define MDS_MAXREQSIZE  (5 * 1024)
 #define MDS_MAXREPSIZE  max(9 * 1024, 362 + LOV_MAX_STRIPE_COUNT * 56)
 
-/** FLD_MAXREQSIZE == lustre_msg + __u32 padding + ptlrpc_body + opc + md_fld */
+/** FLD_MAXREQSIZE == lustre_msg + __u32 padding + ptlrpc_body + opc */
 #define FLD_MAXREQSIZE  (160)
 
-/** FLD_MAXREPSIZE == lustre_msg + ptlrpc_body + md_fld */
+/** FLD_MAXREPSIZE == lustre_msg + ptlrpc_body */
 #define FLD_MAXREPSIZE  (152)
 
 /**
index 3662683..4d23a25 100644 (file)
@@ -173,6 +173,7 @@ struct obd_info {
            - while lock handling, the flags obtained on the enqueue
            request are set here.
            - while stats, the flags used for control delay/resend.
+           - while setattr, the flags used for distinguish punch operation
          */
         int                     oi_flags;
         /* Lock handle specific for every OSC lock. */
index dda23e4..29c543c 100644 (file)
 #error Unsupported operating system.
 #endif
 
+#define OBD_STATFS_NODELAY      0x0001  /* requests should be send without delay
+                                         * and resends for avoid deadlocks */
+#define OBD_STATFS_FROM_CACHE   0x0002  /* the statfs callback should not update
+                                         * obd_osfs_age */
+#define OBD_STATFS_PTLRPCD      0x0004  /* requests will be sent via ptlrpcd
+                                         * instead of a specific set. This
+                                         * means that we cannot rely on the set
+                                         * interpret routine to be called.
+                                         * lov_statfs_fini() must thus be called
+                                         * by the request interpret routine */
+
+#define OBD_FL_PUNCH    0x00000001      /* To indicate it is punch operation */
+
 /* OBD Device Declarations */
 extern struct obd_device *obd_devs[MAX_OBD_DEVICES];
 extern cfs_rwlock_t obd_dev_lock;
index 3b96a4b..2821552 100644 (file)
@@ -2079,7 +2079,7 @@ int target_queue_recovery_request(struct ptlrpc_request *req,
 
         /* CAVEAT EMPTOR: The incoming request message has been swabbed
          * (i.e. buflens etc are in my own byte order), but type-dependent
-         * buffers (eg mds_body, ost_body etc) have NOT been swabbed. */
+         * buffers (eg mdt_body, ost_body etc) have NOT been swabbed. */
 
         if (!transno) {
                 CFS_INIT_LIST_HEAD(&req->rq_list);
index e708584..20281b8 100644 (file)
@@ -416,7 +416,7 @@ error_up:
 }
 
 /**
- * Close IOEpoch (opened file or FMODE_EPOCH state). It happens if:
+ * Close IOEpoch (opened file or MDS_FMODE_EPOCH state). It happens if:
  * - a client closes the IOEpoch;
  * - a client eviction occured.
  * Return values:
@@ -451,8 +451,8 @@ static int mdt_ioepoch_close(struct mdt_thread_info *info, struct mdt_object *o)
 }
 
 /**
- * Close FMODE_SOM state, when IOEpoch is already closed and we are waiting for
- * attribute update. It happens if:
+ * Close MDS_FMODE_SOM state, when IOEpoch is already closed and we are waiting
+ * for attribute update. It happens if:
  * - SOM Attribute Update is obtained;
  * - the client failed to obtain it and informs MDS about it;
  * - a client eviction occured.
@@ -662,7 +662,7 @@ static int mdt_mfd_open(struct mdt_thread_info *info, struct mdt_object *p,
 
                 /*
                  * @flags is always not zero. At least it should be FMODE_READ,
-                 * FMODE_WRITE or FMODE_EXEC.
+                 * FMODE_WRITE or MDS_FMODE_EXEC.
                  */
                 LASSERT(flags != 0);
 
@@ -1473,8 +1473,8 @@ out:
         return result;
 }
 
-#define MFD_CLOSED(mode) (((mode) & ~(FMODE_EPOCH | FMODE_SOM | \
-                                      FMODE_TRUNC)) == FMODE_CLOSED)
+#define MFD_CLOSED(mode) (((mode) & ~(MDS_FMODE_EPOCH | MDS_FMODE_SOM | \
+                                      MDS_FMODE_TRUNC)) == MDS_FMODE_CLOSED)
 
 static int mdt_mfd_closed(struct mdt_file_data *mfd)
 {
@@ -1493,14 +1493,14 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd)
 
         mode = mfd->mfd_mode;
 
-        if ((mode & FMODE_WRITE) || (mode & FMODE_TRUNC)) {
+        if ((mode & FMODE_WRITE) || (mode & MDS_FMODE_TRUNC)) {
                 mdt_write_put(o);
                 ret = mdt_ioepoch_close(info, o);
         } else if (mode & MDS_FMODE_EXEC) {
                 mdt_write_allow(o);
-        } else if (mode & FMODE_EPOCH) {
+        } else if (mode & MDS_FMODE_EPOCH) {
                 ret = mdt_ioepoch_close(info, o);
-        } else if (mode & FMODE_SOM) {
+        } else if (mode & MDS_FMODE_SOM) {
                 ret = mdt_som_au_close(info, o);
         }
 
@@ -1526,7 +1526,7 @@ int mdt_mfd_close(struct mdt_thread_info *info, struct mdt_file_data *mfd)
                  * Put mfd back into the list. */
                 LASSERT(mdt_conn_flags(info) & OBD_CONNECT_SOM);
                 mdt_mfd_set_mode(mfd, ret == MDT_IOEPOCH_OPENED ?
-                                      FMODE_EPOCH : FMODE_SOM);
+                                      MDS_FMODE_EPOCH : MDS_FMODE_SOM);
 
                 LASSERT(mdt_info_req(info));
                 med = &mdt_info_req(info)->rq_export->exp_mdt_data;
@@ -1690,8 +1690,8 @@ int mdt_done_writing(struct mdt_thread_info *info)
                 RETURN(-ESTALE);
         }
 
-        LASSERT(mfd->mfd_mode == FMODE_EPOCH ||
-                mfd->mfd_mode == FMODE_TRUNC);
+        LASSERT(mfd->mfd_mode == MDS_FMODE_EPOCH ||
+                mfd->mfd_mode == MDS_FMODE_TRUNC);
         class_handle_unhash(&mfd->mfd_handle);
         cfs_list_del_init(&mfd->mfd_list);
         cfs_spin_unlock(&med->med_open_lock);
index 78a6874..0c7e6da 100644 (file)
@@ -524,7 +524,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
                 repbody->ioepoch = mo->mot_ioepoch;
 
                 mdt_object_get(info->mti_env, mo);
-                mdt_mfd_set_mode(mfd, FMODE_TRUNC);
+                mdt_mfd_set_mode(mfd, MDS_FMODE_TRUNC);
                 mfd->mfd_object = mo;
                 mfd->mfd_xid = req->rq_xid;
 
@@ -551,7 +551,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
                                info->mti_ioepoch->handle.cookie);
                         GOTO(out_put, rc = -ESTALE);
                 }
-                LASSERT(mfd->mfd_mode == FMODE_SOM);
+                LASSERT(mfd->mfd_mode == MDS_FMODE_SOM);
                 LASSERT(!(info->mti_ioepoch->flags & MF_EPOCH_CLOSE));
 
                 class_handle_unhash(&mfd->mfd_handle);
index 276ecc5..31f4cbe 100644 (file)
@@ -3402,7 +3402,7 @@ int filter_setattr(struct obd_export *exp, struct obd_info *oinfo,
         int rc;
         ENTRY;
 
-        if (oa->o_valid & OBD_FL_TRUNC)
+        if (oinfo->oi_flags & OBD_FL_PUNCH)
                 opc |= CAPA_OPC_OSS_TRUNC;
 
         rc = filter_auth_capa(exp, NULL, oa->o_seq, capa, opc);
@@ -4318,9 +4318,7 @@ static int filter_truncate(struct obd_export *exp, struct obd_info *oinfo,
                 oinfo->oi_policy.l_extent.start);
 
         oinfo->oi_oa->o_size = oinfo->oi_policy.l_extent.start;
-        oinfo->oi_oa->o_valid |= OBD_FL_TRUNC;
         rc = filter_setattr(exp, oinfo, oti);
-        oinfo->oi_oa->o_valid &= ~OBD_FL_TRUNC;
         RETURN(rc);
 }
 
index 8dc1cec..59ab298 100644 (file)
@@ -412,6 +412,7 @@ static int ost_punch(struct obd_export *exp, struct ptlrpc_request *req,
                 oinfo->oi_policy.l_extent.start = oinfo->oi_oa->o_size;
                 oinfo->oi_policy.l_extent.end = oinfo->oi_oa->o_blocks;
                 oinfo->oi_capa = capa;
+                oinfo->oi_flags = OBD_FL_PUNCH;
 
                 req->rq_status = obd_punch(exp, oinfo, oti, NULL);
                 OBD_FREE_PTR(oinfo);
index 960d5d3..562e95f 100644 (file)
@@ -1696,43 +1696,6 @@ void lustre_swab_ost_lvb(struct ost_lvb *lvb)
         __swab64s(&lvb->lvb_blocks);
 }
 
-void lustre_swab_mds_status_req (struct mds_status_req *r)
-{
-        __swab32s (&r->flags);
-        __swab32s (&r->repbuf);
-}
-
-void lustre_swab_mds_body (struct mds_body *b)
-{
-        lustre_swab_ll_fid (&b->fid1);
-        lustre_swab_ll_fid (&b->fid2);
-        /* handle is opaque */
-        __swab64s (&b->valid);
-        __swab64s (&b->size);
-        __swab64s (&b->mtime);
-        __swab64s (&b->atime);
-        __swab64s (&b->ctime);
-        __swab64s (&b->blocks);
-        __swab64s (&b->io_epoch);
-        __swab64s (&b->ino);
-        __swab32s (&b->fsuid);
-        __swab32s (&b->fsgid);
-        __swab32s (&b->capability);
-        __swab32s (&b->mode);
-        __swab32s (&b->uid);
-        __swab32s (&b->gid);
-        __swab32s (&b->flags);
-        __swab32s (&b->rdev);
-        __swab32s (&b->nlink);
-        __swab32s (&b->generation);
-        __swab32s (&b->suppgid);
-        __swab32s (&b->eadatasize);
-        __swab32s (&b->aclsize);
-        __swab32s (&b->max_mdsize);
-        __swab32s (&b->max_cookiesize);
-        CLASSERT(offsetof(typeof(*b), padding_4) != 0);
-}
-
 void lustre_swab_mdt_body (struct mdt_body *b)
 {
         lustre_swab_lu_fid (&b->fid1);
@@ -1845,7 +1808,7 @@ static void lustre_swab_obd_dqblk (struct obd_dqblk *b)
         __swab64s (&b->dqb_btime);
         __swab64s (&b->dqb_itime);
         __swab32s (&b->dqb_valid);
-        CLASSERT(offsetof(typeof(*b), padding) != 0);
+        CLASSERT(offsetof(typeof(*b), dqb_padding) != 0);
 }
 
 void lustre_swab_obd_quotactl (struct obd_quotactl *q)
@@ -1867,15 +1830,6 @@ void lustre_swab_quota_adjust_qunit (struct quota_adjust_qunit *q)
         __swab64s (&q->padding1);
 }
 
-void lustre_swab_mds_remote_perm (struct mds_remote_perm *p)
-{
-        __swab32s (&p->rp_uid);
-        __swab32s (&p->rp_gid);
-        __swab32s (&p->rp_fsuid);
-        __swab32s (&p->rp_fsgid);
-        __swab32s (&p->rp_access_perm);
-};
-
 void lustre_swab_mdt_remote_perm (struct mdt_remote_perm *p)
 {
         __swab32s (&p->rp_uid);
@@ -1885,6 +1839,7 @@ void lustre_swab_mdt_remote_perm (struct mdt_remote_perm *p)
         __swab32s (&p->rp_fsgid);
         __swab32s (&p->rp_fsgid_h);
         __swab32s (&p->rp_access_perm);
+        __swab32s (&p->rp_padding);
 };
 
 void lustre_swab_fid2path(struct getinfo_fid2path *gf)
index f1be6c9..2053ec6 100644 (file)
@@ -30,6 +30,9 @@
  * Use is subject to license terms.
  */
 /*
+ * Copyright (c) 2011 Whamcloud, Inc.
+ */
+/*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
@@ -249,12 +252,9 @@ EXPORT_SYMBOL(lustre_swab_niobuf_remote);
 EXPORT_SYMBOL(lustre_swab_ost_body);
 EXPORT_SYMBOL(lustre_swab_ost_last_id);
 EXPORT_SYMBOL(lustre_swab_ost_lvb);
-EXPORT_SYMBOL(lustre_swab_mds_status_req);
-EXPORT_SYMBOL(lustre_swab_mds_body);
 EXPORT_SYMBOL(lustre_swab_mdt_body);
 EXPORT_SYMBOL(lustre_swab_mdt_ioepoch);
 EXPORT_SYMBOL(lustre_swab_obd_quotactl);
-EXPORT_SYMBOL(lustre_swab_mds_remote_perm);
 EXPORT_SYMBOL(lustre_swab_mdt_remote_perm);
 EXPORT_SYMBOL(lustre_swab_mdt_rec_reint);
 EXPORT_SYMBOL(lustre_swab_lov_desc);
index 458f1d8..2b32ec4 100644 (file)
@@ -68,1898 +68,2770 @@ void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwiretest)
-         * running on Linux venus 2.6.32-131.6.1.el6_lustre.gad4c1d5.x86_64 #1 SMP Thu Jul 28 23:13:5
-         * with gcc version 4.4.4 20100726 (Red Hat 4.4.4-13) (GCC)  */
+         * running on Linux RHEL5 2.6.18-238.9.1 #1 SMP i686 i386 GNU/Linux
+         * with gcc version 4.1.1 20070105 (Red Hat 4.1.1-52) */
 
 
         /* Constants... */
-        LASSERTF(LUSTRE_MSG_MAGIC_V2 == 0x0BD00BD3," found %lld\n",
-                 (long long)LUSTRE_MSG_MAGIC_V2);
-        LASSERTF(PTLRPC_MSG_VERSION == 0x00000003," found %lld\n",
-                 (long long)PTLRPC_MSG_VERSION);
-        LASSERTF(MSGHDR_AT_SUPPORT == 1, " found %lld\n",
-                 (long long)MSGHDR_AT_SUPPORT);
-        LASSERTF(PTL_RPC_MSG_REQUEST == 4711, " found %lld\n",
+        LASSERTF(PTL_RPC_MSG_REQUEST == 4711, "found %lld\n",
                  (long long)PTL_RPC_MSG_REQUEST);
-        LASSERTF(PTL_RPC_MSG_ERR == 4712, " found %lld\n",
+        LASSERTF(PTL_RPC_MSG_ERR == 4712, "found %lld\n",
                  (long long)PTL_RPC_MSG_ERR);
-        LASSERTF(PTL_RPC_MSG_REPLY == 4713, " found %lld\n",
+        LASSERTF(PTL_RPC_MSG_REPLY == 4713, "found %lld\n",
                  (long long)PTL_RPC_MSG_REPLY);
-        LASSERTF(MSG_LAST_REPLAY == 1, " found %lld\n",
-                 (long long)MSG_LAST_REPLAY);
-        LASSERTF(MSG_RESENT == 2, " found %lld\n",
-                 (long long)MSG_RESENT);
-        LASSERTF(MSG_REPLAY == 4, " found %lld\n",
-                 (long long)MSG_REPLAY);
-        LASSERTF(MSG_CONNECT_RECOVERING == 1, " found %lld\n",
-                 (long long)MSG_CONNECT_RECOVERING);
-        LASSERTF(MSG_CONNECT_RECONNECT == 2, " found %lld\n",
-                 (long long)MSG_CONNECT_RECONNECT);
-        LASSERTF(MSG_CONNECT_REPLAYABLE == 4, " found %lld\n",
-                 (long long)MSG_CONNECT_REPLAYABLE);
-        LASSERTF(OST_REPLY == 0, " found %lld\n",
+        LASSERTF(MDS_DIR_END_OFF == 0xfffffffffffffffeULL, "found 0x%.16llxULL\n",
+                 MDS_DIR_END_OFF);
+        LASSERTF(DEAD_HANDLE_MAGIC == 0xdeadbeefcafebabeULL, "found 0x%.16llxULL\n",
+                 DEAD_HANDLE_MAGIC);
+        CLASSERT(MTI_NAME_MAXLEN == 64);
+        LASSERTF(OST_REPLY == 0, "found %lld\n",
                  (long long)OST_REPLY);
-        LASSERTF(OST_GETATTR == 1, " found %lld\n",
+        LASSERTF(OST_GETATTR == 1, "found %lld\n",
                  (long long)OST_GETATTR);
-        LASSERTF(OST_SETATTR == 2, " found %lld\n",
+        LASSERTF(OST_SETATTR == 2, "found %lld\n",
                  (long long)OST_SETATTR);
-        LASSERTF(OST_READ == 3, " found %lld\n",
+        LASSERTF(OST_READ == 3, "found %lld\n",
                  (long long)OST_READ);
-        LASSERTF(OST_WRITE == 4, " found %lld\n",
+        LASSERTF(OST_WRITE == 4, "found %lld\n",
                  (long long)OST_WRITE);
-        LASSERTF(OST_CREATE == 5, " found %lld\n",
+        LASSERTF(OST_CREATE == 5, "found %lld\n",
                  (long long)OST_CREATE);
-        LASSERTF(OST_DESTROY == 6, " found %lld\n",
+        LASSERTF(OST_DESTROY == 6, "found %lld\n",
                  (long long)OST_DESTROY);
-        LASSERTF(OST_GET_INFO == 7, " found %lld\n",
+        LASSERTF(OST_GET_INFO == 7, "found %lld\n",
                  (long long)OST_GET_INFO);
-        LASSERTF(OST_CONNECT == 8, " found %lld\n",
+        LASSERTF(OST_CONNECT == 8, "found %lld\n",
                  (long long)OST_CONNECT);
-        LASSERTF(OST_DISCONNECT == 9, " found %lld\n",
+        LASSERTF(OST_DISCONNECT == 9, "found %lld\n",
                  (long long)OST_DISCONNECT);
-        LASSERTF(OST_PUNCH == 10, " found %lld\n",
+        LASSERTF(OST_PUNCH == 10, "found %lld\n",
                  (long long)OST_PUNCH);
-        LASSERTF(OST_OPEN == 11, " found %lld\n",
+        LASSERTF(OST_OPEN == 11, "found %lld\n",
                  (long long)OST_OPEN);
-        LASSERTF(OST_CLOSE == 12, " found %lld\n",
+        LASSERTF(OST_CLOSE == 12, "found %lld\n",
                  (long long)OST_CLOSE);
-        LASSERTF(OST_STATFS == 13, " found %lld\n",
+        LASSERTF(OST_STATFS == 13, "found %lld\n",
                  (long long)OST_STATFS);
-        LASSERTF(OST_SYNC == 16, " found %lld\n",
+        LASSERTF(OST_SYNC == 16, "found %lld\n",
                  (long long)OST_SYNC);
-        LASSERTF(OST_QUOTACHECK == 18, " found %lld\n",
+        LASSERTF(OST_SET_INFO == 17, "found %lld\n",
+                 (long long)OST_SET_INFO);
+        LASSERTF(OST_QUOTACHECK == 18, "found %lld\n",
                  (long long)OST_QUOTACHECK);
-        LASSERTF(OST_QUOTACTL == 19, " found %lld\n",
+        LASSERTF(OST_QUOTACTL == 19, "found %lld\n",
                  (long long)OST_QUOTACTL);
-        LASSERTF(OST_QUOTA_ADJUST_QUNIT == 20, " found %lld\n",
+        LASSERTF(OST_QUOTA_ADJUST_QUNIT == 20, "found %lld\n",
                  (long long)OST_QUOTA_ADJUST_QUNIT);
-        LASSERTF(OST_LAST_OPC == 21, " found %lld\n",
+        LASSERTF(OST_LAST_OPC == 21, "found %lld\n",
                  (long long)OST_LAST_OPC);
-        LASSERTF(OBD_OBJECT_EOF == 0xffffffffffffffffULL," found %lld\n",
-                 (long long)OBD_OBJECT_EOF);
-        LASSERTF(MDS_GETATTR == 33, " found %lld\n",
+        LASSERTF(OBD_OBJECT_EOF == 0xffffffffffffffffULL, "found 0x%.16llxULL\n",
+                 OBD_OBJECT_EOF);
+        LASSERTF(OST_MIN_PRECREATE == 32, "found %lld\n",
+                 (long long)OST_MIN_PRECREATE);
+        LASSERTF(OST_MAX_PRECREATE == 20000, "found %lld\n",
+                 (long long)OST_MAX_PRECREATE);
+        LASSERTF(OST_LVB_ERR_INIT == 0xffbadbad80000000ULL, "found 0x%.16llxULL\n",
+                 OST_LVB_ERR_INIT);
+        LASSERTF(OST_LVB_ERR_MASK == 0xffbadbad00000000ULL, "found 0x%.16llxULL\n",
+                 OST_LVB_ERR_MASK);
+        LASSERTF(MDS_FIRST_OPC == 33, "found %lld\n",
+                 (long long)MDS_FIRST_OPC);
+        LASSERTF(MDS_GETATTR == 33, "found %lld\n",
                  (long long)MDS_GETATTR);
-        LASSERTF(MDS_GETATTR_NAME == 34, " found %lld\n",
+        LASSERTF(MDS_GETATTR_NAME == 34, "found %lld\n",
                  (long long)MDS_GETATTR_NAME);
-        LASSERTF(MDS_CLOSE == 35, " found %lld\n",
+        LASSERTF(MDS_CLOSE == 35, "found %lld\n",
                  (long long)MDS_CLOSE);
-        LASSERTF(MDS_REINT == 36, " found %lld\n",
+        LASSERTF(MDS_REINT == 36, "found %lld\n",
                  (long long)MDS_REINT);
-        LASSERTF(MDS_READPAGE == 37, " found %lld\n",
+        LASSERTF(MDS_READPAGE == 37, "found %lld\n",
                  (long long)MDS_READPAGE);
-        LASSERTF(MDS_CONNECT == 38, " found %lld\n",
+        LASSERTF(MDS_CONNECT == 38, "found %lld\n",
                  (long long)MDS_CONNECT);
-        LASSERTF(MDS_DISCONNECT == 39, " found %lld\n",
+        LASSERTF(MDS_DISCONNECT == 39, "found %lld\n",
                  (long long)MDS_DISCONNECT);
-        LASSERTF(MDS_GETSTATUS == 40, " found %lld\n",
+        LASSERTF(MDS_GETSTATUS == 40, "found %lld\n",
                  (long long)MDS_GETSTATUS);
-        LASSERTF(MDS_STATFS == 41, " found %lld\n",
+        LASSERTF(MDS_STATFS == 41, "found %lld\n",
                  (long long)MDS_STATFS);
-        LASSERTF(MDS_PIN == 42, " found %lld\n",
+        LASSERTF(MDS_PIN == 42, "found %lld\n",
                  (long long)MDS_PIN);
-        LASSERTF(MDS_UNPIN == 43, " found %lld\n",
+        LASSERTF(MDS_UNPIN == 43, "found %lld\n",
                  (long long)MDS_UNPIN);
-        LASSERTF(MDS_SYNC == 44, " found %lld\n",
+        LASSERTF(MDS_SYNC == 44, "found %lld\n",
                  (long long)MDS_SYNC);
-        LASSERTF(MDS_DONE_WRITING == 45, " found %lld\n",
+        LASSERTF(MDS_DONE_WRITING == 45, "found %lld\n",
                  (long long)MDS_DONE_WRITING);
-        LASSERTF(MDS_SET_INFO == 46, " found %lld\n",
+        LASSERTF(MDS_SET_INFO == 46, "found %lld\n",
                  (long long)MDS_SET_INFO);
-        LASSERTF(MDS_QUOTACHECK == 47, " found %lld\n",
+        LASSERTF(MDS_QUOTACHECK == 47, "found %lld\n",
                  (long long)MDS_QUOTACHECK);
-        LASSERTF(MDS_QUOTACTL == 48, " found %lld\n",
+        LASSERTF(MDS_QUOTACTL == 48, "found %lld\n",
                  (long long)MDS_QUOTACTL);
-        LASSERTF(MDS_GETXATTR == 49, " found %lld\n",
+        LASSERTF(MDS_GETXATTR == 49, "found %lld\n",
                  (long long)MDS_GETXATTR);
-        LASSERTF(MDS_SETXATTR == 50, " found %lld\n",
+        LASSERTF(MDS_SETXATTR == 50, "found %lld\n",
                  (long long)MDS_SETXATTR);
-        LASSERTF(MDS_WRITEPAGE == 51, " found %lld\n",
+        LASSERTF(MDS_WRITEPAGE == 51, "found %lld\n",
                  (long long)MDS_WRITEPAGE);
-        LASSERTF(MDS_IS_SUBDIR == 52, " found %lld\n",
+        LASSERTF(MDS_IS_SUBDIR == 52, "found %lld\n",
                  (long long)MDS_IS_SUBDIR);
-        LASSERTF(MDS_GET_INFO == 53, " found %lld\n",
+        LASSERTF(MDS_GET_INFO == 53, "found %lld\n",
                  (long long)MDS_GET_INFO);
-        LASSERTF(MDS_LAST_OPC == 54, " found %lld\n",
+        LASSERTF(MDS_LAST_OPC == 54, "found %lld\n",
                  (long long)MDS_LAST_OPC);
-        LASSERTF(REINT_SETATTR == 1, " found %lld\n",
+        LASSERTF(REINT_SETATTR == 1, "found %lld\n",
                  (long long)REINT_SETATTR);
-        LASSERTF(REINT_CREATE == 2, " found %lld\n",
+        LASSERTF(REINT_CREATE == 2, "found %lld\n",
                  (long long)REINT_CREATE);
-        LASSERTF(REINT_LINK == 3, " found %lld\n",
+        LASSERTF(REINT_LINK == 3, "found %lld\n",
                  (long long)REINT_LINK);
-        LASSERTF(REINT_UNLINK == 4, " found %lld\n",
+        LASSERTF(REINT_UNLINK == 4, "found %lld\n",
                  (long long)REINT_UNLINK);
-        LASSERTF(REINT_RENAME == 5, " found %lld\n",
+        LASSERTF(REINT_RENAME == 5, "found %lld\n",
                  (long long)REINT_RENAME);
-        LASSERTF(REINT_OPEN == 6, " found %lld\n",
+        LASSERTF(REINT_OPEN == 6, "found %lld\n",
                  (long long)REINT_OPEN);
-        LASSERTF(REINT_MAX == 8, " found %lld\n",
+        LASSERTF(REINT_SETXATTR == 7, "found %lld\n",
+                 (long long)REINT_SETXATTR);
+        LASSERTF(REINT_MAX == 8, "found %lld\n",
                  (long long)REINT_MAX);
-        LASSERTF(MGS_CONNECT == 250, " found %lld\n",
-                 (long long)MGS_CONNECT);
-        LASSERTF(MGS_DISCONNECT == 251, " found %lld\n",
-                 (long long)MGS_DISCONNECT);
-        LASSERTF(MGS_EXCEPTION == 252, " found %lld\n",
-                 (long long)MGS_EXCEPTION);
-        LASSERTF(MGS_TARGET_REG == 253, " found %lld\n",
-                 (long long)MGS_TARGET_REG);
-        LASSERTF(MGS_TARGET_DEL == 254, " found %lld\n",
-                 (long long)MGS_TARGET_DEL);
-        LASSERTF(MGS_SET_INFO == 255, " found %lld\n",
-                 (long long)MGS_SET_INFO);
-        LASSERTF(DISP_IT_EXECD == 1, " found %lld\n",
-                 (long long)DISP_IT_EXECD);
-        LASSERTF(DISP_LOOKUP_EXECD == 2, " found %lld\n",
-                 (long long)DISP_LOOKUP_EXECD);
-        LASSERTF(DISP_LOOKUP_NEG == 4, " found %lld\n",
-                 (long long)DISP_LOOKUP_NEG);
-        LASSERTF(DISP_LOOKUP_POS == 8, " found %lld\n",
-                 (long long)DISP_LOOKUP_POS);
-        LASSERTF(DISP_OPEN_CREATE == 16, " found %lld\n",
-                 (long long)DISP_OPEN_CREATE);
-        LASSERTF(DISP_OPEN_OPEN == 32, " found %lld\n",
-                 (long long)DISP_OPEN_OPEN);
-        LASSERTF(MDS_STATUS_CONN == 1, " found %lld\n",
+        LASSERTF(DISP_IT_EXECD == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_IT_EXECD);
+        LASSERTF(DISP_LOOKUP_EXECD == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_LOOKUP_EXECD);
+        LASSERTF(DISP_LOOKUP_NEG == 0x00000004UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_LOOKUP_NEG);
+        LASSERTF(DISP_LOOKUP_POS == 0x00000008UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_LOOKUP_POS);
+        LASSERTF(DISP_OPEN_CREATE == 0x00000010UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_OPEN_CREATE);
+        LASSERTF(DISP_OPEN_OPEN == 0x00000020UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_OPEN_OPEN);
+        LASSERTF(DISP_ENQ_COMPLETE == 0x00400000UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_ENQ_COMPLETE);
+        LASSERTF(DISP_ENQ_OPEN_REF == 0x00800000UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_ENQ_OPEN_REF);
+        LASSERTF(DISP_ENQ_CREATE_REF == 0x01000000UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_ENQ_CREATE_REF);
+        LASSERTF(DISP_OPEN_LOCK == 0x02000000UL, "found 0x%.8xUL\n",
+                 (unsigned)DISP_OPEN_LOCK);
+        LASSERTF(MDS_STATUS_CONN == 1, "found %lld\n",
                  (long long)MDS_STATUS_CONN);
-        LASSERTF(MDS_STATUS_LOV == 2, " found %lld\n",
+        LASSERTF(MDS_STATUS_LOV == 2, "found %lld\n",
                  (long long)MDS_STATUS_LOV);
-        LASSERTF(LDLM_ENQUEUE == 101, " found %lld\n",
+        LASSERTF(MDS_BFLAG_UNCOMMITTED_WRITES == 1, "found %lld\n",
+                 (long long)MDS_BFLAG_UNCOMMITTED_WRITES);
+        LASSERTF(MF_SOM_CHANGE == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_SOM_CHANGE);
+        LASSERTF(MF_EPOCH_OPEN == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_EPOCH_OPEN);
+        LASSERTF(MF_EPOCH_CLOSE == 0x00000004UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_EPOCH_CLOSE);
+        LASSERTF(MF_MDC_CANCEL_FID1 == 0x00000008UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_MDC_CANCEL_FID1);
+        LASSERTF(MF_MDC_CANCEL_FID2 == 0x00000010UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_MDC_CANCEL_FID2);
+        LASSERTF(MF_MDC_CANCEL_FID3 == 0x00000020UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_MDC_CANCEL_FID3);
+        LASSERTF(MF_MDC_CANCEL_FID4 == 0x00000040UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_MDC_CANCEL_FID4);
+        LASSERTF(MF_SOM_AU == 0x00000080UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_SOM_AU);
+        LASSERTF(MF_GETATTR_LOCK == 0x00000100UL, "found 0x%.8xUL\n",
+                 (unsigned)MF_GETATTR_LOCK);
+        LASSERTF(LQUOTA_FLAGS_GRP == 1, "found %lld\n",
+                 (long long)LQUOTA_FLAGS_GRP);
+        LASSERTF(LQUOTA_FLAGS_BLK == 2, "found %lld\n",
+                 (long long)LQUOTA_FLAGS_BLK);
+        LASSERTF(LQUOTA_FLAGS_ADJBLK == 4, "found %lld\n",
+                 (long long)LQUOTA_FLAGS_ADJBLK);
+        LASSERTF(LQUOTA_FLAGS_ADJINO == 8, "found %lld\n",
+                 (long long)LQUOTA_FLAGS_ADJINO);
+        LASSERTF(LQUOTA_FLAGS_CHG_QS == 16, "found %lld\n",
+                 (long long)LQUOTA_FLAGS_CHG_QS);
+        LASSERTF(LQUOTA_FLAGS_RECOVERY == 32, "found %lld\n",
+                 (long long)LQUOTA_FLAGS_RECOVERY);
+        LASSERTF(LQUOTA_FLAGS_SETQUOTA == 64, "found %lld\n",
+                 (long long)LQUOTA_FLAGS_SETQUOTA);
+        LASSERTF(LQUOTA_QAQ_CREATE_LQS == 0x80000000UL, "found 0x%.8xUL\n",
+                 (unsigned)LQUOTA_QAQ_CREATE_LQS);
+        LASSERTF(MDS_ATTR_MODE == 0x0000000000000001ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_MODE);
+        LASSERTF(MDS_ATTR_UID == 0x0000000000000002ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_UID);
+        LASSERTF(MDS_ATTR_GID == 0x0000000000000004ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_GID);
+        LASSERTF(MDS_ATTR_SIZE == 0x0000000000000008ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_SIZE);
+        LASSERTF(MDS_ATTR_ATIME == 0x0000000000000010ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_ATIME);
+        LASSERTF(MDS_ATTR_MTIME == 0x0000000000000020ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_MTIME);
+        LASSERTF(MDS_ATTR_CTIME == 0x0000000000000040ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_CTIME);
+        LASSERTF(MDS_ATTR_ATIME_SET == 0x0000000000000080ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_ATIME_SET);
+        LASSERTF(MDS_ATTR_MTIME_SET == 0x0000000000000100ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_MTIME_SET);
+        LASSERTF(MDS_ATTR_FORCE == 0x0000000000000200ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_FORCE);
+        LASSERTF(MDS_ATTR_ATTR_FLAG == 0x0000000000000400ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_ATTR_FLAG);
+        LASSERTF(MDS_ATTR_KILL_SUID == 0x0000000000000800ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_KILL_SUID);
+        LASSERTF(MDS_ATTR_KILL_SGID == 0x0000000000001000ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_KILL_SGID);
+        LASSERTF(MDS_ATTR_CTIME_SET == 0x0000000000002000ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_CTIME_SET);
+        LASSERTF(MDS_ATTR_FROM_OPEN == 0x0000000000004000ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_FROM_OPEN);
+        LASSERTF(MDS_ATTR_BLOCKS == 0x0000000000008000ULL, "found 0x%.16llxULL\n",
+                 (long long)MDS_ATTR_BLOCKS);
+        LASSERTF(FLD_QUERY == 900, "found %lld\n",
+                 (long long)FLD_QUERY);
+        LASSERTF(FLD_FIRST_OPC == 900, "found %lld\n",
+                 (long long)FLD_FIRST_OPC);
+        LASSERTF(FLD_LAST_OPC == 901, "found %lld\n",
+                 (long long)FLD_LAST_OPC);
+        LASSERTF(SEQ_QUERY == 700, "found %lld\n",
+                 (long long)SEQ_QUERY);
+        LASSERTF(SEQ_FIRST_OPC == 700, "found %lld\n",
+                 (long long)SEQ_FIRST_OPC);
+        LASSERTF(SEQ_LAST_OPC == 701, "found %lld\n",
+                 (long long)SEQ_LAST_OPC);
+        LASSERTF(SEQ_ALLOC_SUPER == 0, "found %lld\n",
+                 (long long)SEQ_ALLOC_SUPER);
+        LASSERTF(SEQ_ALLOC_META == 1, "found %lld\n",
+                 (long long)SEQ_ALLOC_META);
+        LASSERTF(LDLM_ENQUEUE == 101, "found %lld\n",
                  (long long)LDLM_ENQUEUE);
-        LASSERTF(LDLM_CONVERT == 102, " found %lld\n",
+        LASSERTF(LDLM_CONVERT == 102, "found %lld\n",
                  (long long)LDLM_CONVERT);
-        LASSERTF(LDLM_CANCEL == 103, " found %lld\n",
+        LASSERTF(LDLM_CANCEL == 103, "found %lld\n",
                  (long long)LDLM_CANCEL);
-        LASSERTF(LDLM_BL_CALLBACK == 104, " found %lld\n",
+        LASSERTF(LDLM_BL_CALLBACK == 104, "found %lld\n",
                  (long long)LDLM_BL_CALLBACK);
-        LASSERTF(LDLM_CP_CALLBACK == 105, " found %lld\n",
+        LASSERTF(LDLM_CP_CALLBACK == 105, "found %lld\n",
                  (long long)LDLM_CP_CALLBACK);
-        LASSERTF(LDLM_GL_CALLBACK == 106, " found %lld\n",
+        LASSERTF(LDLM_GL_CALLBACK == 106, "found %lld\n",
                  (long long)LDLM_GL_CALLBACK);
-        LASSERTF(LDLM_SET_INFO == 107, " found %lld\n",
+        LASSERTF(LDLM_SET_INFO == 107, "found %lld\n",
                  (long long)LDLM_SET_INFO);
-        LASSERTF(LDLM_LAST_OPC == 108, " found %lld\n",
+        LASSERTF(LDLM_LAST_OPC == 108, "found %lld\n",
                  (long long)LDLM_LAST_OPC);
-        LASSERTF(LCK_EX == 1, " found %lld\n",
+        LASSERTF(LCK_MINMODE == 0, "found %lld\n",
+                 (long long)LCK_MINMODE);
+        LASSERTF(LCK_EX == 1, "found %lld\n",
                  (long long)LCK_EX);
-        LASSERTF(LCK_PW == 2, " found %lld\n",
+        LASSERTF(LCK_PW == 2, "found %lld\n",
                  (long long)LCK_PW);
-        LASSERTF(LCK_PR == 4, " found %lld\n",
+        LASSERTF(LCK_PR == 4, "found %lld\n",
                  (long long)LCK_PR);
-        LASSERTF(LCK_CW == 8, " found %lld\n",
+        LASSERTF(LCK_CW == 8, "found %lld\n",
                  (long long)LCK_CW);
-        LASSERTF(LCK_CR == 16, " found %lld\n",
+        LASSERTF(LCK_CR == 16, "found %lld\n",
                  (long long)LCK_CR);
-        LASSERTF(LCK_NL == 32, " found %lld\n",
+        LASSERTF(LCK_NL == 32, "found %lld\n",
                  (long long)LCK_NL);
-        LASSERTF(LCK_GROUP == 64, " found %lld\n",
+        LASSERTF(LCK_GROUP == 64, "found %lld\n",
                  (long long)LCK_GROUP);
-        LASSERTF(LCK_MAXMODE == 129, " found %lld\n",
+        LASSERTF(LCK_COS == 128, "found %lld\n",
+                 (long long)LCK_COS);
+        LASSERTF(LCK_MAXMODE == 129, "found %lld\n",
                  (long long)LCK_MAXMODE);
-        LASSERTF(LCK_MODE_NUM == 8, " found %lld\n",
+        LASSERTF(LCK_MODE_NUM == 8, "found %lld\n",
                  (long long)LCK_MODE_NUM);
         CLASSERT(LDLM_PLAIN == 10);
         CLASSERT(LDLM_EXTENT == 11);
         CLASSERT(LDLM_FLOCK == 12);
         CLASSERT(LDLM_IBITS == 13);
-        LASSERTF(OBD_PING == 400, " found %lld\n",
+        CLASSERT(LDLM_MAX_TYPE == 14);
+        LASSERTF(OBD_PING == 400, "found %lld\n",
                  (long long)OBD_PING);
-        LASSERTF(OBD_LOG_CANCEL == 401, " found %lld\n",
+        LASSERTF(OBD_LOG_CANCEL == 401, "found %lld\n",
                  (long long)OBD_LOG_CANCEL);
-        LASSERTF(OBD_QC_CALLBACK == 402, " found %lld\n",
+        LASSERTF(OBD_QC_CALLBACK == 402, "found %lld\n",
                  (long long)OBD_QC_CALLBACK);
-        LASSERTF(OBD_LAST_OPC == 403, " found %lld\n",
+        LASSERTF(OBD_LAST_OPC == 403, "found %lld\n",
                  (long long)OBD_LAST_OPC);
-        LASSERTF(QUOTA_DQACQ == 601, " found %lld\n",
+        LASSERTF(QUOTA_DQACQ == 601, "found %lld\n",
                  (long long)QUOTA_DQACQ);
-        LASSERTF(QUOTA_DQREL == 602, " found %lld\n",
+        LASSERTF(QUOTA_DQREL == 602, "found %lld\n",
                  (long long)QUOTA_DQREL);
-        LASSERTF(MGS_CONNECT == 250, " found %lld\n",
+        LASSERTF(QUOTA_LAST_OPC == 603, "found %lld\n",
+                 (long long)QUOTA_LAST_OPC);
+        LASSERTF(MGS_CONNECT == 250, "found %lld\n",
                  (long long)MGS_CONNECT);
-        LASSERTF(MGS_DISCONNECT == 251, " found %lld\n",
+        LASSERTF(MGS_DISCONNECT == 251, "found %lld\n",
                  (long long)MGS_DISCONNECT);
-        LASSERTF(MGS_EXCEPTION == 252, " found %lld\n",
+        LASSERTF(MGS_EXCEPTION == 252, "found %lld\n",
                  (long long)MGS_EXCEPTION);
-        LASSERTF(MGS_TARGET_REG == 253, " found %lld\n",
+        LASSERTF(MGS_TARGET_REG == 253, "found %lld\n",
                  (long long)MGS_TARGET_REG);
-        LASSERTF(MGS_TARGET_DEL == 254, " found %lld\n",
+        LASSERTF(MGS_TARGET_DEL == 254, "found %lld\n",
                  (long long)MGS_TARGET_DEL);
-        LASSERTF(MGS_SET_INFO == 255, " found %lld\n",
+        LASSERTF(MGS_SET_INFO == 255, "found %lld\n",
                  (long long)MGS_SET_INFO);
-        LASSERTF(LDF_EMPTY == 1, " found %lld\n",
-                 (long long)LDF_EMPTY);
-        LASSERTF(LDF_COLLIDE == 2, " found %lld\n",
-                 (long long)LDF_COLLIDE);
-        LASSERTF(LU_PAGE_SIZE == 4096, " found %lld\n",
-                 (long long)LU_PAGE_SIZE);
+        LASSERTF(MGS_LAST_OPC == 257, "found %lld\n",
+                 (long long)MGS_LAST_OPC);
+        LASSERTF(SEC_CTX_INIT == 801, "found %lld\n",
+                 (long long)SEC_CTX_INIT);
+        LASSERTF(SEC_CTX_INIT_CONT == 802, "found %lld\n",
+                 (long long)SEC_CTX_INIT_CONT);
+        LASSERTF(SEC_CTX_FINI == 803, "found %lld\n",
+                 (long long)SEC_CTX_FINI);
+        LASSERTF(SEC_LAST_OPC == 804, "found %lld\n",
+                 (long long)SEC_LAST_OPC);
         /* Sizes and Offsets */
 
         /* Checks for struct obd_uuid */
-        LASSERTF((int)sizeof(struct obd_uuid) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct obd_uuid) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct obd_uuid));
 
+        /* Checks for struct lu_seq_range */
+        LASSERTF((int)sizeof(struct lu_seq_range) == 24, "found %lld\n",
+                 (long long)(int)sizeof(struct lu_seq_range));
+        LASSERTF((int)offsetof(struct lu_seq_range, lsr_start) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_seq_range, lsr_start));
+        LASSERTF((int)sizeof(((struct lu_seq_range *)0)->lsr_start) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_seq_range *)0)->lsr_start));
+        LASSERTF((int)offsetof(struct lu_seq_range, lsr_end) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_seq_range, lsr_end));
+        LASSERTF((int)sizeof(((struct lu_seq_range *)0)->lsr_end) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_seq_range *)0)->lsr_end));
+        LASSERTF((int)offsetof(struct lu_seq_range, lsr_index) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_seq_range, lsr_index));
+        LASSERTF((int)sizeof(((struct lu_seq_range *)0)->lsr_index) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_seq_range *)0)->lsr_index));
+        LASSERTF((int)offsetof(struct lu_seq_range, lsr_flags) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_seq_range, lsr_flags));
+        LASSERTF((int)sizeof(((struct lu_seq_range *)0)->lsr_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_seq_range *)0)->lsr_flags));
+        LASSERTF(LU_SEQ_RANGE_MDT == 0, "found %lld\n",
+                 (long long)LU_SEQ_RANGE_MDT);
+        LASSERTF(LU_SEQ_RANGE_OST == 1, "found %lld\n",
+                 (long long)LU_SEQ_RANGE_OST);
+
+        /* Checks for struct lustre_mdt_attrs */
+        LASSERTF((int)sizeof(struct lustre_mdt_attrs) == 64, "found %lld\n",
+                 (long long)(int)sizeof(struct lustre_mdt_attrs));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_compat) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_compat));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_compat) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_compat));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_incompat) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_incompat));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_incompat) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_incompat));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_self_fid) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_self_fid));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_self_fid) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_self_fid));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_flags) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_flags));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_flags) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_flags));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_ioepoch) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_ioepoch));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_ioepoch) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_ioepoch));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_som_size) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_som_size));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_som_size) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_som_size));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_som_blocks) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_som_blocks));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_som_blocks) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_som_blocks));
+        LASSERTF((int)offsetof(struct lustre_mdt_attrs, lma_som_mountid) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct lustre_mdt_attrs, lma_som_mountid));
+        LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_som_mountid) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_som_mountid));
+        LASSERTF(LMA_INCOMPAT_SUPP == 0x0, "found %lld\n",
+                 (long long)LMA_INCOMPAT_SUPP);
+        LASSERTF(LMAC_HSM == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)LMAC_HSM);
+        LASSERTF(LMAC_SOM == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)LMAC_SOM);
+
+        /* Checks for struct ost_id */
+        LASSERTF((int)sizeof(struct ost_id) == 16, "found %lld\n",
+                 (long long)(int)sizeof(struct ost_id));
+        LASSERTF((int)offsetof(struct ost_id, oi_id) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_id, oi_id));
+        LASSERTF((int)sizeof(((struct ost_id *)0)->oi_id) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_id *)0)->oi_id));
+        LASSERTF((int)offsetof(struct ost_id, oi_seq) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_id, oi_seq));
+        LASSERTF((int)sizeof(((struct ost_id *)0)->oi_seq) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_id *)0)->oi_seq));
+        LASSERTF(LUSTRE_FID_INIT_OID == 1, "found %lld\n",
+                 (long long)LUSTRE_FID_INIT_OID);
+        LASSERTF(FID_SEQ_OST_MDT0 == 0, "found %lld\n",
+                 (long long)FID_SEQ_OST_MDT0);
+        LASSERTF(FID_SEQ_LLOG == 1, "found %lld\n",
+                 (long long)FID_SEQ_LLOG);
+        LASSERTF(FID_SEQ_ECHO == 2, "found %lld\n",
+                 (long long)FID_SEQ_ECHO);
+        LASSERTF(FID_SEQ_OST_MDT1 == 3, "found %lld\n",
+                 (long long)FID_SEQ_OST_MDT1);
+        LASSERTF(FID_SEQ_OST_MAX == 9, "found %lld\n",
+                 (long long)FID_SEQ_OST_MAX);
+        LASSERTF(FID_SEQ_RSVD == 11, "found %lld\n",
+                 (long long)FID_SEQ_RSVD);
+        LASSERTF(FID_SEQ_IGIF == 12, "found %lld\n",
+                 (long long)FID_SEQ_IGIF);
+        LASSERTF(FID_SEQ_IGIF_MAX == 0x00000000ffffffffULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_IGIF_MAX);
+        LASSERTF(FID_SEQ_IDIF == 0x0000000100000000ULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_IDIF);
+        LASSERTF(FID_SEQ_IDIF_MAX == 0x00000001ffffffffULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_IDIF_MAX);
+        LASSERTF(FID_SEQ_START == 0x0000000200000000ULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_START);
+        LASSERTF(FID_SEQ_LOCAL_FILE == 0x0000000200000001ULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_LOCAL_FILE);
+        LASSERTF(FID_SEQ_DOT_LUSTRE == 0x0000000200000002ULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_DOT_LUSTRE);
+        LASSERTF(FID_SEQ_NORMAL == 0x0000000200000400ULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_NORMAL);
+        LASSERTF(FID_SEQ_LOV_DEFAULT == 0xffffffffffffffffULL, "found 0x%.16llxULL\n",
+                 (long long)FID_SEQ_LOV_DEFAULT);
+
+        /* Checks for struct lu_dirent */
+        LASSERTF((int)sizeof(struct lu_dirent) == 32, "found %lld\n",
+                 (long long)(int)sizeof(struct lu_dirent));
+        LASSERTF((int)offsetof(struct lu_dirent, lde_fid) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirent, lde_fid));
+        LASSERTF((int)sizeof(((struct lu_dirent *)0)->lde_fid) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirent *)0)->lde_fid));
+        LASSERTF((int)offsetof(struct lu_dirent, lde_hash) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirent, lde_hash));
+        LASSERTF((int)sizeof(((struct lu_dirent *)0)->lde_hash) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirent *)0)->lde_hash));
+        LASSERTF((int)offsetof(struct lu_dirent, lde_reclen) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirent, lde_reclen));
+        LASSERTF((int)sizeof(((struct lu_dirent *)0)->lde_reclen) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirent *)0)->lde_reclen));
+        LASSERTF((int)offsetof(struct lu_dirent, lde_namelen) == 26, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirent, lde_namelen));
+        LASSERTF((int)sizeof(((struct lu_dirent *)0)->lde_namelen) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirent *)0)->lde_namelen));
+        LASSERTF((int)offsetof(struct lu_dirent, lde_attrs) == 28, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirent, lde_attrs));
+        LASSERTF((int)sizeof(((struct lu_dirent *)0)->lde_attrs) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirent *)0)->lde_attrs));
+        LASSERTF((int)offsetof(struct lu_dirent, lde_name[0]) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirent, lde_name[0]));
+        LASSERTF((int)sizeof(((struct lu_dirent *)0)->lde_name[0]) == 1, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirent *)0)->lde_name[0]));
+        LASSERTF(LUDA_FID == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)LUDA_FID);
+        LASSERTF(LUDA_TYPE == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)LUDA_TYPE);
+        LASSERTF(LUDA_64BITHASH == 0x00000004UL, "found 0x%.8xUL\n",
+                 (unsigned)LUDA_64BITHASH);
+
+        /* Checks for struct luda_type */
+        LASSERTF((int)sizeof(struct luda_type) == 2, "found %lld\n",
+                 (long long)(int)sizeof(struct luda_type));
+        LASSERTF((int)offsetof(struct luda_type, lt_type) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct luda_type, lt_type));
+        LASSERTF((int)sizeof(((struct luda_type *)0)->lt_type) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct luda_type *)0)->lt_type));
+
+        /* Checks for struct lu_dirpage */
+        LASSERTF((int)sizeof(struct lu_dirpage) == 24, "found %lld\n",
+                 (long long)(int)sizeof(struct lu_dirpage));
+        LASSERTF((int)offsetof(struct lu_dirpage, ldp_hash_start) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirpage, ldp_hash_start));
+        LASSERTF((int)sizeof(((struct lu_dirpage *)0)->ldp_hash_start) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirpage *)0)->ldp_hash_start));
+        LASSERTF((int)offsetof(struct lu_dirpage, ldp_hash_end) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirpage, ldp_hash_end));
+        LASSERTF((int)sizeof(((struct lu_dirpage *)0)->ldp_hash_end) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirpage *)0)->ldp_hash_end));
+        LASSERTF((int)offsetof(struct lu_dirpage, ldp_flags) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirpage, ldp_flags));
+        LASSERTF((int)sizeof(((struct lu_dirpage *)0)->ldp_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirpage *)0)->ldp_flags));
+        LASSERTF((int)offsetof(struct lu_dirpage, ldp_pad0) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirpage, ldp_pad0));
+        LASSERTF((int)sizeof(((struct lu_dirpage *)0)->ldp_pad0) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirpage *)0)->ldp_pad0));
+        LASSERTF((int)offsetof(struct lu_dirpage, ldp_entries[0]) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_dirpage, ldp_entries[0]));
+        LASSERTF((int)sizeof(((struct lu_dirpage *)0)->ldp_entries[0]) == 32, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_dirpage *)0)->ldp_entries[0]));
+        LASSERTF(LDF_EMPTY == 1, "found %lld\n",
+                 (long long)LDF_EMPTY);
+        LASSERTF(LDF_COLLIDE == 2, "found %lld\n",
+                 (long long)LDF_COLLIDE);
+        LASSERTF(LU_PAGE_SIZE == 4096, "found %lld\n",
+                 (long long)LU_PAGE_SIZE);
+
         /* Checks for struct lustre_handle */
-        LASSERTF((int)sizeof(struct lustre_handle) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(struct lustre_handle) == 8, "found %lld\n",
                  (long long)(int)sizeof(struct lustre_handle));
-        LASSERTF((int)offsetof(struct lustre_handle, cookie) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_handle, cookie) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_handle, cookie));
-        LASSERTF((int)sizeof(((struct lustre_handle *)0)->cookie) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_handle *)0)->cookie) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_handle *)0)->cookie));
 
         /* Checks for struct lustre_msg_v2 */
-        LASSERTF((int)sizeof(struct lustre_msg_v2) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct lustre_msg_v2) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct lustre_msg_v2));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_bufcount) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_bufcount) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_bufcount));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_bufcount) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_bufcount) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_bufcount));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_secflvr) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_secflvr) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_secflvr));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_secflvr) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_secflvr) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_secflvr));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_magic) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_magic) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_magic));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_magic) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_magic) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_magic));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_repsize) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_repsize) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_repsize));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_repsize) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_repsize) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_repsize));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_cksum) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_cksum) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_cksum));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_cksum) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_cksum) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_cksum));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_flags) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_flags) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_flags));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_flags));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_padding_2) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_padding_2) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_padding_2));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_padding_2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_padding_2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_padding_2));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_padding_3) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_padding_3) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_padding_3));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_padding_3) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_padding_3) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_padding_3));
-        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_buflens[0]) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct lustre_msg_v2, lm_buflens[0]) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct lustre_msg_v2, lm_buflens[0]));
-        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_buflens[0]) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_buflens[0]) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_buflens[0]));
+        LASSERTF(LUSTRE_MSG_MAGIC_V1 == 0x0BD00BD0, "found 0x%.8x\n",
+                 LUSTRE_MSG_MAGIC_V1);
+        LASSERTF(LUSTRE_MSG_MAGIC_V2 == 0x0BD00BD3, "found 0x%.8x\n",
+                 LUSTRE_MSG_MAGIC_V2);
+        LASSERTF(LUSTRE_MSG_MAGIC_V1_SWABBED == 0xD00BD00B, "found 0x%.8x\n",
+                 LUSTRE_MSG_MAGIC_V1_SWABBED);
+        LASSERTF(LUSTRE_MSG_MAGIC_V2_SWABBED == 0xD30BD00B, "found 0x%.8x\n",
+                 LUSTRE_MSG_MAGIC_V2_SWABBED);
 
         /* Checks for struct ptlrpc_body */
-        LASSERTF((int)sizeof(struct ptlrpc_body) == 152, " found %lld\n",
+        LASSERTF((int)sizeof(struct ptlrpc_body) == 152, "found %lld\n",
                  (long long)(int)sizeof(struct ptlrpc_body));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_handle) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_handle) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_handle));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_handle) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_handle) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_handle));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_type) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_type) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_type));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_type) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_type));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_version) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_version) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_version));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_version) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_version) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_version));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_opc) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_opc) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_opc));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_opc) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_opc) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_opc));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_status) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_status) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_status));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_status) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_status) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_status));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_last_xid) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_last_xid) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_last_xid));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_last_xid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_last_xid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_last_xid));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_last_seen) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_last_seen) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_last_seen));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_last_seen) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_last_seen) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_last_seen));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_last_committed) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_last_committed) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_last_committed));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_last_committed) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_last_committed) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_last_committed));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_transno) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_transno) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_transno));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_transno) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_transno) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_transno));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_flags) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_flags) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_flags));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_flags));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_op_flags) == 60, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_op_flags) == 60, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_op_flags));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_op_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_op_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_op_flags));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_conn_cnt) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_conn_cnt) == 64, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_conn_cnt));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_conn_cnt) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_conn_cnt) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_conn_cnt));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_timeout) == 68, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_timeout) == 68, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_timeout));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_timeout) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_timeout) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_timeout));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_service_time) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_service_time) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_service_time));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_service_time) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_service_time) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_service_time));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_slv) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_slv) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_slv));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_slv) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_slv) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_slv));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_limit) == 76, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_limit) == 76, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_limit));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_limit) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_limit) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_limit));
         CLASSERT(PTLRPC_NUM_VERSIONS == 4);
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_pre_versions[4]) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_pre_versions[4]) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body, pb_pre_versions[4]));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_pre_versions[4]) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_pre_versions[4]) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_pre_versions[4]));
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding[4]) == 152, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body, pb_padding[4]));
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding[4]) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding[4]));
+        LASSERTF(MSG_PTLRPC_BODY_OFF == 0, "found %lld\n",
+                 (long long)MSG_PTLRPC_BODY_OFF);
+        LASSERTF(REQ_REC_OFF == 1, "found %lld\n",
+                 (long long)REQ_REC_OFF);
+        LASSERTF(REPLY_REC_OFF == 1, "found %lld\n",
+                 (long long)REPLY_REC_OFF);
+        LASSERTF(DLM_LOCKREQ_OFF == 1, "found %lld\n",
+                 (long long)DLM_LOCKREQ_OFF);
+        LASSERTF(DLM_REQ_REC_OFF == 2, "found %lld\n",
+                 (long long)DLM_REQ_REC_OFF);
+        LASSERTF(DLM_INTENT_IT_OFF == 2, "found %lld\n",
+                 (long long)DLM_INTENT_IT_OFF);
+        LASSERTF(DLM_INTENT_REC_OFF == 3, "found %lld\n",
+                 (long long)DLM_INTENT_REC_OFF);
+        LASSERTF(DLM_LOCKREPLY_OFF == 1, "found %lld\n",
+                 (long long)DLM_LOCKREPLY_OFF);
+        LASSERTF(DLM_REPLY_REC_OFF == 2, "found %lld\n",
+                 (long long)DLM_REPLY_REC_OFF);
+        LASSERTF(MSG_PTLRPC_HEADER_OFF == 31, "found %lld\n",
+                 (long long)MSG_PTLRPC_HEADER_OFF);
+        LASSERTF(PTLRPC_MSG_VERSION == 0x00000003, "found 0x%.8x\n",
+                 PTLRPC_MSG_VERSION);
+        LASSERTF(LUSTRE_VERSION_MASK == 0xffff0000, "found 0x%.8x\n",
+                 LUSTRE_VERSION_MASK);
+        LASSERTF(LUSTRE_OBD_VERSION == 0x00010000, "found 0x%.8x\n",
+                 LUSTRE_OBD_VERSION);
+        LASSERTF(LUSTRE_MDS_VERSION == 0x00020000, "found 0x%.8x\n",
+                 LUSTRE_MDS_VERSION);
+        LASSERTF(LUSTRE_OST_VERSION == 0x00030000, "found 0x%.8x\n",
+                 LUSTRE_OST_VERSION);
+        LASSERTF(LUSTRE_DLM_VERSION == 0x00040000, "found 0x%.8x\n",
+                 LUSTRE_DLM_VERSION);
+        LASSERTF(LUSTRE_LOG_VERSION == 0x00050000, "found 0x%.8x\n",
+                 LUSTRE_LOG_VERSION);
+        LASSERTF(LUSTRE_MGS_VERSION == 0x00060000, "found 0x%.8x\n",
+                 LUSTRE_MGS_VERSION);
+        LASSERTF(MSGHDR_AT_SUPPORT == 1, "found %lld\n",
+                 (long long)MSGHDR_AT_SUPPORT);
+        LASSERTF(MSGHDR_CKSUM_INCOMPAT18 == 2, "found %lld\n",
+                 (long long)MSGHDR_CKSUM_INCOMPAT18);
+        LASSERTF(MSG_OP_FLAG_MASK == 0xffff0000UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_OP_FLAG_MASK);
+        LASSERTF(MSG_OP_FLAG_SHIFT == 16, "found %lld\n",
+                 (long long)MSG_OP_FLAG_SHIFT);
+        LASSERTF(MSG_GEN_FLAG_MASK == 0x0000ffffUL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_GEN_FLAG_MASK);
+        LASSERTF(MSG_LAST_REPLAY == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_LAST_REPLAY);
+        LASSERTF(MSG_RESENT == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_RESENT);
+        LASSERTF(MSG_REPLAY == 0x00000004UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_REPLAY);
+        LASSERTF(MSG_DELAY_REPLAY == 0x00000010UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_DELAY_REPLAY);
+        LASSERTF(MSG_VERSION_REPLAY == 0x00000020UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_VERSION_REPLAY);
+        LASSERTF(MSG_REQ_REPLAY_DONE == 0x00000040UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_REQ_REPLAY_DONE);
+        LASSERTF(MSG_LOCK_REPLAY_DONE == 0x00000080UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_LOCK_REPLAY_DONE);
+        LASSERTF(MSG_CONNECT_RECOVERING == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_RECOVERING);
+        LASSERTF(MSG_CONNECT_RECONNECT == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_RECONNECT);
+        LASSERTF(MSG_CONNECT_REPLAYABLE == 0x00000004UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_REPLAYABLE);
+        LASSERTF(MSG_CONNECT_LIBCLIENT == 0x00000010UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_LIBCLIENT);
+        LASSERTF(MSG_CONNECT_INITIAL == 0x00000020UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_INITIAL);
+        LASSERTF(MSG_CONNECT_ASYNC == 0x00000040UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_ASYNC);
+        LASSERTF(MSG_CONNECT_NEXT_VER == 0x00000080UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_NEXT_VER);
+        LASSERTF(MSG_CONNECT_TRANSNO == 0x00000100UL, "found 0x%.8xUL\n",
+                 (unsigned)MSG_CONNECT_TRANSNO);
 
         /* Checks for struct obd_connect_data */
-        LASSERTF((int)sizeof(struct obd_connect_data) == 192, " found %lld\n",
+        LASSERTF((int)sizeof(struct obd_connect_data) == 192, "found %lld\n",
                  (long long)(int)sizeof(struct obd_connect_data));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_connect_flags) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_connect_flags) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_connect_flags));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_connect_flags) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_connect_flags) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_connect_flags));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_version) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_version) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_version));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_version) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_version) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_version));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_grant) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_grant) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_grant));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_grant) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_grant) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_grant));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_index) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_index) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_index));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_index) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_index) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_index));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_brw_size) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_brw_size) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_brw_size));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_brw_size) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_brw_size) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_brw_size));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_ibits_known) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_ibits_known) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_ibits_known));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_nllu) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_nllu) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_nllu));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_nllu) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_nllu) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_nllu));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_nllg) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_nllg) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_nllg));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_nllg) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_nllg) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_nllg));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_transno) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_transno) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_transno));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_transno) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_transno) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_transno));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_group) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_group) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_group));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_group) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_group) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_group));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_cksum_types) == 52, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_cksum_types) == 52, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_cksum_types));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_cksum_types) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_cksum_types) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_cksum_types));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_max_easize) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_max_easize) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_max_easize));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_max_easize) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_max_easize) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_max_easize));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_instance) == 60, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_instance) == 60, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_instance));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_instance) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_instance) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_instance));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_maxbytes) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_maxbytes) == 64, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding1) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, padding1) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, padding1));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->padding1));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding2) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, padding2) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, padding2));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
-        CLASSERT(OBD_CONNECT_RDONLY == 0x1ULL);
-        CLASSERT(OBD_CONNECT_INDEX == 0x2ULL);
-        CLASSERT(OBD_CONNECT_MDS == 0x4ULL);
-        CLASSERT(OBD_CONNECT_GRANT == 0x8ULL);
-        CLASSERT(OBD_CONNECT_SRVLOCK == 0x10ULL);
-        CLASSERT(OBD_CONNECT_VERSION == 0x20ULL);
-        CLASSERT(OBD_CONNECT_REQPORTAL == 0x40ULL);
-        CLASSERT(OBD_CONNECT_ACL == 0x80ULL);
-        CLASSERT(OBD_CONNECT_XATTR == 0x100ULL);
-        CLASSERT(OBD_CONNECT_CROW == 0x200ULL);
-        CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x400ULL);
-        CLASSERT(OBD_CONNECT_TRANSNO == 0x800ULL);
-        CLASSERT(OBD_CONNECT_IBITS == 0x1000ULL);
-        CLASSERT(OBD_CONNECT_JOIN == 0x2000ULL);
-        CLASSERT(OBD_CONNECT_ATTRFID == 0x4000ULL);
-        CLASSERT(OBD_CONNECT_NODEVOH == 0x8000ULL);
-        CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x10000ULL);
-        CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x20000ULL);
-        CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL);
-        CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
-        CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL);
-        CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL);
-        CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL);
-        CLASSERT(OBD_CONNECT_SOM == 0x800000ULL);
-        CLASSERT(OBD_CONNECT_AT == 0x1000000ULL);
-        CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x2000000ULL);
-        CLASSERT(OBD_CONNECT_MDS_MDS == 0x4000000ULL);
-        CLASSERT(OBD_CONNECT_REAL == 0x8000000ULL);
-        CLASSERT(OBD_CONNECT_CHANGE_QS == 0x10000000ULL);
-        CLASSERT(OBD_CONNECT_CKSUM == 0x20000000ULL);
-        CLASSERT(OBD_CONNECT_FID == 0x40000000ULL);
-        CLASSERT(OBD_CONNECT_VBR == 0x80000000ULL);
-        CLASSERT(OBD_CONNECT_LOV_V3 == 0x100000000ULL);
-        CLASSERT(OBD_CONNECT_GRANT_SHRINK == 0x200000000ULL);
-        CLASSERT(OBD_CONNECT_SKIP_ORPHAN == 0x400000000ULL);
-        CLASSERT(OBD_CONNECT_MAX_EASIZE == 0x800000000ULL);
-        CLASSERT(OBD_CONNECT_FULL20 == 0x1000000000ULL);
-        CLASSERT(OBD_CONNECT_LAYOUTLOCK == 0x2000000000ULL);
-        CLASSERT(OBD_CONNECT_64BITHASH == 0x4000000000ULL);
-        CLASSERT(OBD_CONNECT_MAXBYTES == 0x8000000000ULL);
-        CLASSERT(OBD_CONNECT_IMP_RECOV == 0x10000000000ULL);
+        LASSERTF(OBD_CONNECT_RDONLY == 0x1ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_RDONLY);
+        LASSERTF(OBD_CONNECT_INDEX == 0x2ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_INDEX);
+        LASSERTF(OBD_CONNECT_MDS == 0x4ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_MDS);
+        LASSERTF(OBD_CONNECT_GRANT == 0x8ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_GRANT);
+        LASSERTF(OBD_CONNECT_SRVLOCK == 0x10ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_SRVLOCK);
+        LASSERTF(OBD_CONNECT_VERSION == 0x20ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_VERSION);
+        LASSERTF(OBD_CONNECT_REQPORTAL == 0x40ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_REQPORTAL);
+        LASSERTF(OBD_CONNECT_ACL == 0x80ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_ACL);
+        LASSERTF(OBD_CONNECT_XATTR == 0x100ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_XATTR);
+        LASSERTF(OBD_CONNECT_CROW == 0x200ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_CROW);
+        LASSERTF(OBD_CONNECT_TRUNCLOCK == 0x400ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_TRUNCLOCK);
+        LASSERTF(OBD_CONNECT_TRANSNO == 0x800ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_TRANSNO);
+        LASSERTF(OBD_CONNECT_IBITS == 0x1000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_IBITS);
+        LASSERTF(OBD_CONNECT_JOIN == 0x2000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_JOIN);
+        LASSERTF(OBD_CONNECT_ATTRFID == 0x4000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_ATTRFID);
+        LASSERTF(OBD_CONNECT_NODEVOH == 0x8000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_NODEVOH);
+        LASSERTF(OBD_CONNECT_RMT_CLIENT == 0x10000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_RMT_CLIENT);
+        LASSERTF(OBD_CONNECT_RMT_CLIENT_FORCE == 0x20000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_RMT_CLIENT_FORCE);
+        LASSERTF(OBD_CONNECT_BRW_SIZE == 0x40000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_BRW_SIZE);
+        LASSERTF(OBD_CONNECT_QUOTA64 == 0x80000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_QUOTA64);
+        LASSERTF(OBD_CONNECT_MDS_CAPA == 0x100000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_MDS_CAPA);
+        LASSERTF(OBD_CONNECT_OSS_CAPA == 0x200000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_OSS_CAPA);
+        LASSERTF(OBD_CONNECT_CANCELSET == 0x400000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_CANCELSET);
+        LASSERTF(OBD_CONNECT_SOM == 0x800000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_SOM);
+        LASSERTF(OBD_CONNECT_AT == 0x1000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_AT);
+        LASSERTF(OBD_CONNECT_LRU_RESIZE == 0x2000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_LRU_RESIZE);
+        LASSERTF(OBD_CONNECT_MDS_MDS == 0x4000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_MDS_MDS);
+        LASSERTF(OBD_CONNECT_REAL == 0x8000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_REAL);
+        LASSERTF(OBD_CONNECT_CHANGE_QS == 0x10000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_CHANGE_QS);
+        LASSERTF(OBD_CONNECT_CKSUM == 0x20000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_CKSUM);
+        LASSERTF(OBD_CONNECT_FID == 0x40000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_FID);
+        LASSERTF(OBD_CONNECT_VBR == 0x80000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_VBR);
+        LASSERTF(OBD_CONNECT_LOV_V3 == 0x100000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_LOV_V3);
+        LASSERTF(OBD_CONNECT_GRANT_SHRINK == 0x200000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_GRANT_SHRINK);
+        LASSERTF(OBD_CONNECT_SKIP_ORPHAN == 0x400000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_SKIP_ORPHAN);
+        LASSERTF(OBD_CONNECT_MAX_EASIZE == 0x800000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_MAX_EASIZE);
+        LASSERTF(OBD_CONNECT_FULL20 == 0x1000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_FULL20);
+        LASSERTF(OBD_CONNECT_LAYOUTLOCK == 0x2000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_LAYOUTLOCK);
+        LASSERTF(OBD_CONNECT_64BITHASH == 0x4000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_64BITHASH);
+        LASSERTF(OBD_CONNECT_MAXBYTES == 0x8000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_MAXBYTES);
+        LASSERTF(OBD_CONNECT_IMP_RECOV == 0x10000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_IMP_RECOV);
+        LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)OBD_CKSUM_CRC32);
+        LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)OBD_CKSUM_ADLER);
+        LASSERTF(OBD_CKSUM_CRC32C == 0x00000004UL, "found 0x%.8xUL\n",
+                 (unsigned)OBD_CKSUM_CRC32C);
 
         /* Checks for struct obdo */
-        LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
+        LASSERTF((int)sizeof(struct obdo) == 208, "found %lld\n",
                  (long long)(int)sizeof(struct obdo));
-        LASSERTF((int)offsetof(struct obdo, o_valid) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_valid) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_valid));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_valid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_valid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_valid));
-        LASSERTF((int)offsetof(struct obdo, o_oi.oi_id) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_oi.oi_id) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_oi.oi_id));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_id) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_id) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_id));
-        LASSERTF((int)offsetof(struct obdo, o_oi.oi_seq) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_oi.oi_seq) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_oi.oi_seq));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_seq) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_seq) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_seq));
-        LASSERTF((int)offsetof(struct obdo, o_parent_seq) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_parent_seq) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_parent_seq));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_seq) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_seq) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_parent_seq));
-        LASSERTF((int)offsetof(struct obdo, o_size) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_size) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_size));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_size) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_size) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_size));
-        LASSERTF((int)offsetof(struct obdo, o_mtime) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_mtime) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_mtime));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_mtime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_mtime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_mtime));
-        LASSERTF((int)offsetof(struct obdo, o_atime) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_atime) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_atime));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_atime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_atime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_atime));
-        LASSERTF((int)offsetof(struct obdo, o_ctime) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_ctime) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_ctime));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_ctime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_ctime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_ctime));
-        LASSERTF((int)offsetof(struct obdo, o_blocks) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_blocks) == 64, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_blocks));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_blocks) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_blocks) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_blocks));
-        LASSERTF((int)offsetof(struct obdo, o_grant) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_grant) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_grant));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_grant) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_grant) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_grant));
-        LASSERTF((int)offsetof(struct obdo, o_blksize) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_blksize) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_blksize));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_blksize) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_blksize) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_blksize));
-        LASSERTF((int)offsetof(struct obdo, o_mode) == 84, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_mode) == 84, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_mode));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_mode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_mode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_mode));
-        LASSERTF((int)offsetof(struct obdo, o_uid) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_uid) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_uid));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_uid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_uid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_uid));
-        LASSERTF((int)offsetof(struct obdo, o_gid) == 92, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_gid) == 92, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_gid));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_gid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_gid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_gid));
-        LASSERTF((int)offsetof(struct obdo, o_flags) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_flags) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_flags));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_flags));
-        LASSERTF((int)offsetof(struct obdo, o_nlink) == 100, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_nlink) == 100, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_nlink));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_nlink) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_nlink) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_nlink));
-        LASSERTF((int)offsetof(struct obdo, o_parent_oid) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_parent_oid) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_parent_oid));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_oid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_oid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_parent_oid));
-        LASSERTF((int)offsetof(struct obdo, o_misc) == 108, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_misc) == 108, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_misc));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_misc) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_misc) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_misc));
-        LASSERTF((int)offsetof(struct obdo, o_ioepoch) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_ioepoch) == 112, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_ioepoch));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_ioepoch) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_ioepoch) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_ioepoch));
-        LASSERTF((int)offsetof(struct obdo, o_stripe_idx) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_stripe_idx) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_stripe_idx));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_stripe_idx) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_stripe_idx) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_stripe_idx));
-        LASSERTF((int)offsetof(struct obdo, o_parent_ver) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_parent_ver) == 124, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_parent_ver));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_ver) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_ver) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_parent_ver));
-        LASSERTF((int)offsetof(struct obdo, o_handle) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_handle) == 128, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_handle));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_handle) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_handle) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_handle));
-        LASSERTF((int)offsetof(struct obdo, o_lcookie) == 136, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_lcookie) == 136, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_lcookie));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_lcookie) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_lcookie) == 32, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_lcookie));
-        LASSERTF((int)offsetof(struct obdo, o_uid_h) == 168, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_uid_h) == 168, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_uid_h));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_uid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_uid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_uid_h));
-        LASSERTF((int)offsetof(struct obdo, o_gid_h) == 172, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_gid_h) == 172, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_gid_h));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_gid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_gid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_gid_h));
-        LASSERTF((int)offsetof(struct obdo, o_padding_3) == 176, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_padding_3) == 176, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_padding_3));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_3) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_3) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_padding_3));
-        LASSERTF((int)offsetof(struct obdo, o_padding_4) == 184, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_padding_4) == 184, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_padding_4));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_4) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_4) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_padding_4));
-        LASSERTF((int)offsetof(struct obdo, o_padding_5) == 192, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_padding_5) == 192, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_padding_5));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_5) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_5) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_padding_5));
-        LASSERTF((int)offsetof(struct obdo, o_padding_6) == 200, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_padding_6) == 200, "found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_padding_6));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_6) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_6) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_padding_6));
-        CLASSERT(OBD_MD_FLID == (0x00000001ULL));
-        CLASSERT(OBD_MD_FLATIME == (0x00000002ULL));
-        CLASSERT(OBD_MD_FLMTIME == (0x00000004ULL));
-        CLASSERT(OBD_MD_FLCTIME == (0x00000008ULL));
-        CLASSERT(OBD_MD_FLSIZE == (0x00000010ULL));
-        CLASSERT(OBD_MD_FLBLOCKS == (0x00000020ULL));
-        CLASSERT(OBD_MD_FLBLKSZ == (0x00000040ULL));
-        CLASSERT(OBD_MD_FLMODE == (0x00000080ULL));
-        CLASSERT(OBD_MD_FLTYPE == (0x00000100ULL));
-        CLASSERT(OBD_MD_FLUID == (0x00000200ULL));
-        CLASSERT(OBD_MD_FLGID == (0x00000400ULL));
-        CLASSERT(OBD_MD_FLFLAGS == (0x00000800ULL));
-        CLASSERT(OBD_MD_FLNLINK == (0x00002000ULL));
-        CLASSERT(OBD_MD_FLGENER == (0x00004000ULL));
-        CLASSERT(OBD_MD_FLRDEV == (0x00010000ULL));
-        CLASSERT(OBD_MD_FLEASIZE == (0x00020000ULL));
-        CLASSERT(OBD_MD_LINKNAME == (0x00040000ULL));
-        CLASSERT(OBD_MD_FLHANDLE == (0x00080000ULL));
-        CLASSERT(OBD_MD_FLCKSUM == (0x00100000ULL));
-        CLASSERT(OBD_MD_FLQOS == (0x00200000ULL));
-        CLASSERT(OBD_MD_FLCOOKIE == (0x00800000ULL));
-        CLASSERT(OBD_MD_FLGROUP == (0x01000000ULL));
-        CLASSERT(OBD_MD_FLFID == (0x02000000ULL));
-        CLASSERT(OBD_MD_FLEPOCH == (0x04000000ULL));
-        CLASSERT(OBD_MD_FLGRANT == (0x08000000ULL));
-        CLASSERT(OBD_MD_FLDIREA == (0x10000000ULL));
-        CLASSERT(OBD_MD_FLUSRQUOTA == (0x20000000ULL));
-        CLASSERT(OBD_MD_FLGRPQUOTA == (0x40000000ULL));
-        CLASSERT(OBD_MD_FLMODEASIZE == (0x80000000ULL));
-        CLASSERT(OBD_MD_MDS == (0x0000000100000000ULL));
-        CLASSERT(OBD_MD_REINT == (0x0000000200000000ULL));
-        CLASSERT(OBD_MD_FLXATTR == (0x0000001000000000ULL));
-        CLASSERT(OBD_MD_FLXATTRLS == (0x0000002000000000ULL));
-        CLASSERT(OBD_MD_FLXATTRRM == (0x0000004000000000ULL));
-        CLASSERT(OBD_MD_FLACL == (0x0000008000000000ULL));
-        CLASSERT(OBD_FL_INLINEDATA == 1);
-        CLASSERT(OBD_FL_OBDMDEXISTS == 2);
-        CLASSERT(OBD_FL_DELORPHAN == 4);
-        CLASSERT(OBD_FL_NORPC == 8);
-        CLASSERT(OBD_FL_IDONLY == 16);
-        CLASSERT(OBD_FL_RECREATE_OBJS == 32);
-        CLASSERT(OBD_FL_DEBUG_CHECK == 64);
-        CLASSERT(OBD_FL_NO_USRQUOTA == 256);
-        CLASSERT(OBD_FL_NO_GRPQUOTA == 512);
-        CLASSERT(OBD_FL_SRVLOCK == 2048);
-        CLASSERT(OBD_FL_CKSUM_CRC32 == 4096);
-        CLASSERT(OBD_FL_CKSUM_ADLER == 8192);
-        CLASSERT(OBD_FL_CKSUM_CRC32C == 16384);
-        CLASSERT(OBD_FL_SHRINK_GRANT == 131072);
-        CLASSERT(OBD_FL_MMAP == 262144);
-        CLASSERT(OBD_FL_RECOV_RESEND == 524288);
-        CLASSERT(OBD_CKSUM_CRC32 == 1);
-        CLASSERT(OBD_CKSUM_ADLER == 2);
-        CLASSERT(OBD_CKSUM_CRC32C == 4);
+        LASSERTF(OBD_MD_FLID == (0x00000001ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLID);
+        LASSERTF(OBD_MD_FLATIME == (0x00000002ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLATIME);
+        LASSERTF(OBD_MD_FLMTIME == (0x00000004ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLMTIME);
+        LASSERTF(OBD_MD_FLCTIME == (0x00000008ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLCTIME);
+        LASSERTF(OBD_MD_FLSIZE == (0x00000010ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLSIZE);
+        LASSERTF(OBD_MD_FLBLOCKS == (0x00000020ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLBLOCKS);
+        LASSERTF(OBD_MD_FLBLKSZ == (0x00000040ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLBLKSZ);
+        LASSERTF(OBD_MD_FLMODE == (0x00000080ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLMODE);
+        LASSERTF(OBD_MD_FLTYPE == (0x00000100ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLTYPE);
+        LASSERTF(OBD_MD_FLUID == (0x00000200ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLUID);
+        LASSERTF(OBD_MD_FLGID == (0x00000400ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLGID);
+        LASSERTF(OBD_MD_FLFLAGS == (0x00000800ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLFLAGS);
+        LASSERTF(OBD_MD_FLNLINK == (0x00002000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLNLINK);
+        LASSERTF(OBD_MD_FLGENER == (0x00004000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLGENER);
+        LASSERTF(OBD_MD_FLRDEV == (0x00010000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLRDEV);
+        LASSERTF(OBD_MD_FLEASIZE == (0x00020000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLEASIZE);
+        LASSERTF(OBD_MD_LINKNAME == (0x00040000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_LINKNAME);
+        LASSERTF(OBD_MD_FLHANDLE == (0x00080000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLHANDLE);
+        LASSERTF(OBD_MD_FLCKSUM == (0x00100000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLCKSUM);
+        LASSERTF(OBD_MD_FLQOS == (0x00200000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLQOS);
+        LASSERTF(OBD_MD_FLCOOKIE == (0x00800000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLCOOKIE);
+        LASSERTF(OBD_MD_FLGROUP == (0x01000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLGROUP);
+        LASSERTF(OBD_MD_FLFID == (0x02000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLFID);
+        LASSERTF(OBD_MD_FLEPOCH == (0x04000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLEPOCH);
+        LASSERTF(OBD_MD_FLGRANT == (0x08000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLGRANT);
+        LASSERTF(OBD_MD_FLDIREA == (0x10000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLDIREA);
+        LASSERTF(OBD_MD_FLUSRQUOTA == (0x20000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLUSRQUOTA);
+        LASSERTF(OBD_MD_FLGRPQUOTA == (0x40000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLGRPQUOTA);
+        LASSERTF(OBD_MD_FLMODEASIZE == (0x80000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLMODEASIZE);
+        LASSERTF(OBD_MD_MDS == (0x0000000100000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_MDS);
+        LASSERTF(OBD_MD_REINT == (0x0000000200000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_REINT);
+        LASSERTF(OBD_MD_MEA == (0x0000000400000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_MEA);
+        LASSERTF(OBD_MD_MDTIDX == (0x0000000800000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_MDTIDX);
+        LASSERTF(OBD_MD_FLXATTR == (0x0000001000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLXATTR);
+        LASSERTF(OBD_MD_FLXATTRLS == (0x0000002000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLXATTRLS);
+        LASSERTF(OBD_MD_FLXATTRRM == (0x0000004000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLXATTRRM);
+        LASSERTF(OBD_MD_FLACL == (0x0000008000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLACL);
+        LASSERTF(OBD_MD_FLRMTPERM == (0x0000010000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLRMTPERM);
+        LASSERTF(OBD_MD_FLMDSCAPA == (0x0000020000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLMDSCAPA);
+        LASSERTF(OBD_MD_FLOSSCAPA == (0x0000040000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLOSSCAPA);
+        LASSERTF(OBD_MD_FLCKSPLIT == (0x0000080000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLCKSPLIT);
+        LASSERTF(OBD_MD_FLCROSSREF == (0x0000100000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLCROSSREF);
+        LASSERTF(OBD_MD_FLGETATTRLOCK == (0x0000200000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLGETATTRLOCK);
+        LASSERTF(OBD_MD_FLRMTLSETFACL == (0x0001000000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLRMTLSETFACL);
+        LASSERTF(OBD_MD_FLRMTLGETFACL == (0x0002000000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLRMTLGETFACL);
+        LASSERTF(OBD_MD_FLRMTRSETFACL == (0x0004000000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLRMTRSETFACL);
+        LASSERTF(OBD_MD_FLRMTRGETFACL == (0x0008000000000000ULL), "found 0x%.16llxULL\n",
+                 OBD_MD_FLRMTRGETFACL);
+        CLASSERT(OBD_FL_INLINEDATA == 0x00000001);
+        CLASSERT(OBD_FL_OBDMDEXISTS == 0x00000002);
+        CLASSERT(OBD_FL_DELORPHAN == 0x00000004);
+        CLASSERT(OBD_FL_NORPC == 0x00000008);
+        CLASSERT(OBD_FL_IDONLY == 0x00000010);
+        CLASSERT(OBD_FL_RECREATE_OBJS == 0x00000020);
+        CLASSERT(OBD_FL_DEBUG_CHECK == 0x00000040);
+        CLASSERT(OBD_FL_NO_USRQUOTA == 0x00000100);
+        CLASSERT(OBD_FL_NO_GRPQUOTA == 0x00000200);
+        CLASSERT(OBD_FL_CREATE_CROW == 0x00000400);
+        CLASSERT(OBD_FL_SRVLOCK == 0x00000800);
+        CLASSERT(OBD_FL_CKSUM_CRC32 == 0x00001000);
+        CLASSERT(OBD_FL_CKSUM_ADLER == 0x00002000);
+        CLASSERT(OBD_FL_CKSUM_CRC32C == 0x00004000);
+        CLASSERT(OBD_FL_CKSUM_RSVD2 == 0x00008000);
+        CLASSERT(OBD_FL_CKSUM_RSVD3 == 0x00010000);
+        CLASSERT(OBD_FL_SHRINK_GRANT == 0x00020000);
+        CLASSERT(OBD_FL_MMAP == 0x00040000);
+        CLASSERT(OBD_FL_RECOV_RESEND == 0x00080000);
+        CLASSERT(OBD_FL_NOSPC_BLK == 0x00100000);
+        CLASSERT(OBD_FL_LOCAL_MASK == 0xf0000000);
+
+        /* Checks for struct lov_ost_data_v1 */
+        LASSERTF((int)sizeof(struct lov_ost_data_v1) == 24, "found %lld\n",
+                 (long long)(int)sizeof(struct lov_ost_data_v1));
+        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_object_id) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_ost_data_v1, l_object_id));
+        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_id) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_id));
+        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_object_seq) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_ost_data_v1, l_object_seq));
+        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_seq) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_seq));
+        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_ost_gen) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_ost_data_v1, l_ost_gen));
+        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_gen) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_gen));
+        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_ost_idx) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_ost_data_v1, l_ost_idx));
+        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx));
 
         /* Checks for struct lov_mds_md_v1 */
-        LASSERTF((int)sizeof(struct lov_mds_md_v1) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct lov_mds_md_v1) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct lov_mds_md_v1));
-        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_magic) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_magic) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v1, lmm_magic));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_magic) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_magic) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_magic));
-        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_pattern) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_pattern) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v1, lmm_pattern));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_pattern) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_pattern) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_pattern));
-        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_object_id) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_object_id) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v1, lmm_object_id));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_object_id) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_object_id) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_object_id));
-        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_object_seq) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_object_seq) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v1, lmm_object_seq));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_object_seq) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_object_seq) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_object_seq));
-        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_stripe_size) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_stripe_size) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v1, lmm_stripe_size));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_size) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_size) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_size));
-        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_stripe_count) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_stripe_count) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v1, lmm_stripe_count));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_count));
-        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_objects) == 32, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_mds_md_v1, lmm_objects));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_objects) == 0, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_objects));
-
-        /* Checks for struct lov_ost_data_v1 */
-        LASSERTF((int)sizeof(struct lov_ost_data_v1) == 24, " found %lld\n",
-                 (long long)(int)sizeof(struct lov_ost_data_v1));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_object_id) == 0, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_object_id));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_id) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_id));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_object_seq) == 8, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_object_seq));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_seq) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_seq));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_ost_gen) == 16, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_ost_gen));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_gen) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_gen));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_ost_idx) == 20, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_ost_idx));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx));
+        LASSERTF((int)offsetof(struct lov_mds_md_v1, lmm_objects[0]) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_mds_md_v1, lmm_objects[0]));
+        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_objects[0]) == 24, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_objects[0]));
         CLASSERT(LOV_MAGIC_V1 == 0x0BD10BD0);
-        LASSERTF(LOV_PATTERN_RAID0 == 1, " found %lld\n",
-                 (long long)LOV_PATTERN_RAID0);
-        LASSERTF(LOV_PATTERN_RAID1 == 2, " found %lld\n",
-                 (long long)LOV_PATTERN_RAID1);
 
         /* Checks for struct lov_mds_md_v3 */
-        LASSERTF((int)sizeof(struct lov_mds_md_v3) == 48, " found %lld\n",
+        LASSERTF((int)sizeof(struct lov_mds_md_v3) == 48, "found %lld\n",
                  (long long)(int)sizeof(struct lov_mds_md_v3));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_magic) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_magic) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v3, lmm_magic));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_magic) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_magic) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_magic));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_pattern) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_pattern) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v3, lmm_pattern));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pattern) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pattern) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pattern));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_object_id) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_object_id) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v3, lmm_object_id));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_object_id) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_object_id) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_object_id));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_object_seq) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_object_seq) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v3, lmm_object_seq));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_object_seq) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_object_seq) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_object_seq));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_stripe_size) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_stripe_size) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v3, lmm_stripe_size));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_size) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_size) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_size));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_stripe_count) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_stripe_count) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct lov_mds_md_v3, lmm_stripe_count));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_count));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_pool_name) == 32, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_pool_name));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pool_name) == 16, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pool_name));
-        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_objects) == 48, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_objects));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_objects) == 0, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_objects));
-
-        /* Checks for struct lov_ost_data_v1 */
-        LASSERTF((int)sizeof(struct lov_ost_data_v1) == 24, " found %lld\n",
-                 (long long)(int)sizeof(struct lov_ost_data_v1));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_object_id) == 0, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_object_id));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_id) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_id));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_object_seq) == 8, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_object_seq));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_seq) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_object_seq));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_ost_gen) == 16, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_ost_gen));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_gen) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_gen));
-        LASSERTF((int)offsetof(struct lov_ost_data_v1, l_ost_idx) == 20, " found %lld\n",
-                 (long long)(int)offsetof(struct lov_ost_data_v1, l_ost_idx));
-        LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx));
+        CLASSERT(LOV_MAXPOOLNAME == 16);
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_pool_name[16]) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_pool_name[16]));
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pool_name[16]) == 1, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pool_name[16]));
+        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_objects[0]) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_objects[0]));
+        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_objects[0]) == 24, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_objects[0]));
         CLASSERT(LOV_MAGIC_V3 == 0x0BD30BD0);
-        LASSERTF(LOV_PATTERN_RAID0 == 1, " found %lld\n",
-                 (long long)LOV_PATTERN_RAID0);
-        LASSERTF(LOV_PATTERN_RAID1 == 2, " found %lld\n",
-                 (long long)LOV_PATTERN_RAID1);
+        LASSERTF(LOV_PATTERN_RAID0 == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)LOV_PATTERN_RAID0);
+        LASSERTF(LOV_PATTERN_RAID1 == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)LOV_PATTERN_RAID1);
+        LASSERTF(LOV_PATTERN_FIRST == 0x00000100UL, "found 0x%.8xUL\n",
+                 (unsigned)LOV_PATTERN_FIRST);
+        LASSERTF(LOV_PATTERN_CMOBD == 0x00000200UL, "found 0x%.8xUL\n",
+                 (unsigned)LOV_PATTERN_CMOBD);
 
         /* Checks for struct obd_statfs */
-        LASSERTF((int)sizeof(struct obd_statfs) == 144, " found %lld\n",
+        LASSERTF((int)sizeof(struct obd_statfs) == 144, "found %lld\n",
                  (long long)(int)sizeof(struct obd_statfs));
-        LASSERTF((int)offsetof(struct obd_statfs, os_type) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_type) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_type));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_type) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_type) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_type));
-        LASSERTF((int)offsetof(struct obd_statfs, os_blocks) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_blocks) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_blocks));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_blocks) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_blocks) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_blocks));
-        LASSERTF((int)offsetof(struct obd_statfs, os_bfree) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_bfree) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_bfree));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_bfree) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_bfree) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_bfree));
-        LASSERTF((int)offsetof(struct obd_statfs, os_bavail) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_bavail) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_bavail));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_bavail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_bavail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_bavail));
-        LASSERTF((int)offsetof(struct obd_statfs, os_ffree) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_ffree) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_ffree));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_ffree) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_ffree) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_ffree));
-        LASSERTF((int)offsetof(struct obd_statfs, os_fsid) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_fsid) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_fsid));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_fsid) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_fsid) == 40, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_fsid));
-        LASSERTF((int)offsetof(struct obd_statfs, os_bsize) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_bsize) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_bsize));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_bsize) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_bsize) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_bsize));
-        LASSERTF((int)offsetof(struct obd_statfs, os_namelen) == 92, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_namelen) == 92, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_namelen));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_namelen) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_namelen) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_namelen));
-        LASSERTF((int)offsetof(struct obd_statfs, os_state) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_state) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_state));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_state) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_state) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_state));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare1) == 108, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare1) == 108, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare1));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare1));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare2) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare2) == 112, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare2));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare2));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare3) == 116, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare3) == 116, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare3));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare3) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare3) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare3));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare4) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare4) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare4));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare4) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare4) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare4));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare5) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare5) == 124, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare5));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare5) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare5) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare5));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare6) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare6) == 128, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare6));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare6) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare6) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare6));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare7) == 132, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare7) == 132, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare7));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare7) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare7) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare7));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare8) == 136, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare8) == 136, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare8));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare8) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare8) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare8));
-        LASSERTF((int)offsetof(struct obd_statfs, os_spare9) == 140, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_statfs, os_spare9) == 140, "found %lld\n",
                  (long long)(int)offsetof(struct obd_statfs, os_spare9));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare9) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare9) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare9));
 
         /* Checks for struct obd_ioobj */
-        LASSERTF((int)sizeof(struct obd_ioobj) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(struct obd_ioobj) == 24, "found %lld\n",
                  (long long)(int)sizeof(struct obd_ioobj));
-        LASSERTF((int)offsetof(struct obd_ioobj, ioo_id) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_ioobj, ioo_id) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct obd_ioobj, ioo_id));
-        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_id) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_id) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_id));
-        LASSERTF((int)offsetof(struct obd_ioobj, ioo_seq) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_ioobj, ioo_seq) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct obd_ioobj, ioo_seq));
-        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_seq) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_seq) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_seq));
-        LASSERTF((int)offsetof(struct obd_ioobj, ioo_type) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_ioobj, ioo_type) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct obd_ioobj, ioo_type));
-        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_type) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_type));
-        LASSERTF((int)offsetof(struct obd_ioobj, ioo_bufcnt) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_ioobj, ioo_bufcnt) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct obd_ioobj, ioo_bufcnt));
-        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt));
 
         /* Checks for struct obd_quotactl */
-        LASSERTF((int)sizeof(struct obd_quotactl) == 112, " found %lld\n",
+        LASSERTF((int)sizeof(struct obd_quotactl) == 112, "found %lld\n",
                  (long long)(int)sizeof(struct obd_quotactl));
-        LASSERTF((int)offsetof(struct obd_quotactl, qc_cmd) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_cmd) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct obd_quotactl, qc_cmd));
-        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_cmd) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_cmd) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_cmd));
-        LASSERTF((int)offsetof(struct obd_quotactl, qc_type) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_type) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct obd_quotactl, qc_type));
-        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_type) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_type));
-        LASSERTF((int)offsetof(struct obd_quotactl, qc_id) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_id) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct obd_quotactl, qc_id));
-        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_id) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_id) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_id));
-        LASSERTF((int)offsetof(struct obd_quotactl, qc_stat) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_stat) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct obd_quotactl, qc_stat));
-        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_stat) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_stat) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_stat));
-        LASSERTF((int)offsetof(struct obd_quotactl, qc_dqinfo) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_dqinfo) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct obd_quotactl, qc_dqinfo));
-        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_dqinfo) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_dqinfo) == 24, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_dqinfo));
-        LASSERTF((int)offsetof(struct obd_quotactl, qc_dqblk) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_dqblk) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct obd_quotactl, qc_dqblk));
-        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_dqblk) == 72, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_dqblk) == 72, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_dqblk));
 
         /* Checks for struct obd_dqinfo */
-        LASSERTF((int)sizeof(struct obd_dqinfo) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(struct obd_dqinfo) == 24, "found %lld\n",
                  (long long)(int)sizeof(struct obd_dqinfo));
-        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_bgrace) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_bgrace) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqinfo, dqi_bgrace));
-        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_bgrace) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_bgrace) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_bgrace));
-        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_igrace) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_igrace) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqinfo, dqi_igrace));
-        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_igrace) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_igrace) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_igrace));
-        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_flags) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_flags) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqinfo, dqi_flags));
-        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_flags));
-        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_valid) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_valid) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqinfo, dqi_valid));
-        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_valid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_valid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_valid));
 
         /* Checks for struct obd_dqblk */
-        LASSERTF((int)sizeof(struct obd_dqblk) == 72, " found %lld\n",
+        LASSERTF((int)sizeof(struct obd_dqblk) == 72, "found %lld\n",
                  (long long)(int)sizeof(struct obd_dqblk));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_bhardlimit) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_bhardlimit) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_bhardlimit));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_bhardlimit) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_bhardlimit) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bhardlimit));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_bsoftlimit) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_bsoftlimit) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_bsoftlimit));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_bsoftlimit) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_bsoftlimit) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bsoftlimit));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_curspace) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_curspace) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_curspace));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_curspace) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_curspace) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curspace));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_ihardlimit) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_ihardlimit) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_ihardlimit));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_ihardlimit) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_ihardlimit) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_ihardlimit));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_isoftlimit) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_isoftlimit) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_isoftlimit));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_isoftlimit) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_isoftlimit) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_isoftlimit));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_curinodes) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_curinodes) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_curinodes));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_curinodes) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_curinodes) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curinodes));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_btime) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_btime) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_btime));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_btime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_btime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_btime));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_itime) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_itime) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_itime));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_itime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_itime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_itime));
-        LASSERTF((int)offsetof(struct obd_dqblk, dqb_valid) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_valid) == 64, "found %lld\n",
                  (long long)(int)offsetof(struct obd_dqblk, dqb_valid));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_valid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_valid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_valid));
-        LASSERTF((int)offsetof(struct obd_dqblk, padding) == 68, " found %lld\n",
-                 (long long)(int)offsetof(struct obd_dqblk, padding));
-        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->padding));
-        LASSERTF(Q_QUOTACHECK == 0x800100," found %lld\n",
-                 (long long)Q_QUOTACHECK);
-        LASSERTF(Q_INITQUOTA == 0x800101," found %lld\n",
-                 (long long)Q_INITQUOTA);
-        LASSERTF(Q_GETOINFO == 0x800102," found %lld\n",
-                 (long long)Q_GETOINFO);
-        LASSERTF(Q_GETOQUOTA == 0x800103," found %lld\n",
-                 (long long)Q_GETOQUOTA);
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_padding) == 68, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_padding));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_padding));
+        LASSERTF(Q_QUOTACHECK == 0x800100, "found 0x%.8x\n",
+                 Q_QUOTACHECK);
+        LASSERTF(Q_INITQUOTA == 0x800101, "found 0x%.8x\n",
+                 Q_INITQUOTA);
+        LASSERTF(Q_GETOINFO == 0x800102, "found 0x%.8x\n",
+                 Q_GETOINFO);
+        LASSERTF(Q_GETOQUOTA == 0x800103, "found 0x%.8x\n",
+                 Q_GETOQUOTA);
+        LASSERTF(Q_FINVALIDATE == 0x800104, "found 0x%.8x\n",
+                 Q_FINVALIDATE);
 
         /* Checks for struct niobuf_remote */
-        LASSERTF((int)sizeof(struct niobuf_remote) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(struct niobuf_remote) == 16, "found %lld\n",
                  (long long)(int)sizeof(struct niobuf_remote));
-        LASSERTF((int)offsetof(struct niobuf_remote, offset) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct niobuf_remote, offset) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct niobuf_remote, offset));
-        LASSERTF((int)sizeof(((struct niobuf_remote *)0)->offset) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct niobuf_remote *)0)->offset) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct niobuf_remote *)0)->offset));
-        LASSERTF((int)offsetof(struct niobuf_remote, len) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct niobuf_remote, len) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct niobuf_remote, len));
-        LASSERTF((int)sizeof(((struct niobuf_remote *)0)->len) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct niobuf_remote *)0)->len) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct niobuf_remote *)0)->len));
-        LASSERTF((int)offsetof(struct niobuf_remote, flags) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct niobuf_remote, flags) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct niobuf_remote, flags));
-        LASSERTF((int)sizeof(((struct niobuf_remote *)0)->flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct niobuf_remote *)0)->flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct niobuf_remote *)0)->flags));
-        LASSERTF(OBD_BRW_READ == 1, " found %lld\n",
-                 (long long)OBD_BRW_READ);
-        LASSERTF(OBD_BRW_WRITE == 2, " found %lld\n",
-                 (long long)OBD_BRW_WRITE);
-        LASSERTF(OBD_BRW_SYNC == 8, " found %lld\n",
-                 (long long)OBD_BRW_SYNC);
-        LASSERTF(OBD_BRW_FROM_GRANT == 32, " found %lld\n",
-                 (long long)OBD_BRW_FROM_GRANT);
-        LASSERTF(OBD_BRW_NOQUOTA == 256, " found %lld\n",
-                 (long long)OBD_BRW_NOQUOTA);
+        LASSERTF(OBD_BRW_READ == 0x01, "found 0x%.8x\n",
+                 OBD_BRW_READ);
+        LASSERTF(OBD_BRW_WRITE == 0x02, "found 0x%.8x\n",
+                 OBD_BRW_WRITE);
+        LASSERTF(OBD_BRW_SYNC == 0x08, "found 0x%.8x\n",
+                 OBD_BRW_SYNC);
+        LASSERTF(OBD_BRW_CHECK == 0x10, "found 0x%.8x\n",
+                 OBD_BRW_CHECK);
+        LASSERTF(OBD_BRW_FROM_GRANT == 0x20, "found 0x%.8x\n",
+                 OBD_BRW_FROM_GRANT);
+        LASSERTF(OBD_BRW_GRANTED == 0x40, "found 0x%.8x\n",
+                 OBD_BRW_GRANTED);
+        LASSERTF(OBD_BRW_NOCACHE == 0x80, "found 0x%.8x\n",
+                 OBD_BRW_NOCACHE);
+        LASSERTF(OBD_BRW_NOQUOTA == 0x100, "found 0x%.8x\n",
+                 OBD_BRW_NOQUOTA);
+        LASSERTF(OBD_BRW_SRVLOCK == 0x200, "found 0x%.8x\n",
+                 OBD_BRW_SRVLOCK);
+        LASSERTF(OBD_BRW_ASYNC == 0x400, "found 0x%.8x\n",
+                 OBD_BRW_ASYNC);
+        LASSERTF(OBD_BRW_MEMALLOC == 0x800, "found 0x%.8x\n",
+                 OBD_BRW_MEMALLOC);
 
         /* Checks for struct ost_body */
-        LASSERTF((int)sizeof(struct ost_body) == 208, " found %lld\n",
+        LASSERTF((int)sizeof(struct ost_body) == 208, "found %lld\n",
                  (long long)(int)sizeof(struct ost_body));
-        LASSERTF((int)offsetof(struct ost_body, oa) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ost_body, oa) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ost_body, oa));
-        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 208, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 208, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_body *)0)->oa));
 
         /* Checks for struct ll_fid */
-        LASSERTF((int)sizeof(struct ll_fid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(struct ll_fid) == 16, "found %lld\n",
                  (long long)(int)sizeof(struct ll_fid));
-        LASSERTF((int)offsetof(struct ll_fid, id) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ll_fid, id) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ll_fid, id));
-        LASSERTF((int)sizeof(((struct ll_fid *)0)->id) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ll_fid *)0)->id) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ll_fid *)0)->id));
-        LASSERTF((int)offsetof(struct ll_fid, generation) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ll_fid, generation) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ll_fid, generation));
-        LASSERTF((int)sizeof(((struct ll_fid *)0)->generation) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ll_fid *)0)->generation) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ll_fid *)0)->generation));
-        LASSERTF((int)offsetof(struct ll_fid, f_type) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct ll_fid, f_type) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct ll_fid, f_type));
-        LASSERTF((int)sizeof(((struct ll_fid *)0)->f_type) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ll_fid *)0)->f_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ll_fid *)0)->f_type));
 
-        /* Checks for struct mds_status_req */
-        LASSERTF((int)sizeof(struct mds_status_req) == 8, " found %lld\n",
-                 (long long)(int)sizeof(struct mds_status_req));
-        LASSERTF((int)offsetof(struct mds_status_req, flags) == 0, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_status_req, flags));
-        LASSERTF((int)sizeof(((struct mds_status_req *)0)->flags) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_status_req *)0)->flags));
-        LASSERTF((int)offsetof(struct mds_status_req, repbuf) == 4, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_status_req, repbuf));
-        LASSERTF((int)sizeof(((struct mds_status_req *)0)->repbuf) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_status_req *)0)->repbuf));
-
-        /* Checks for struct mds_body */
-        LASSERTF((int)sizeof(struct mds_body) == 168, " found %lld\n",
-                 (long long)(int)sizeof(struct mds_body));
-        LASSERTF((int)offsetof(struct mds_body, fid1) == 0, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, fid1));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid1) == 16, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->fid1));
-        LASSERTF((int)offsetof(struct mds_body, fid2) == 16, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, fid2));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid2) == 16, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->fid2));
-        LASSERTF((int)offsetof(struct mds_body, handle) == 32, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, handle));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->handle) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->handle));
-        LASSERTF((int)offsetof(struct mds_body, size) == 48, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, size));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->size) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->size));
-        LASSERTF((int)offsetof(struct mds_body, blocks) == 80, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, blocks));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->blocks) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->blocks));
-        LASSERTF((int)offsetof(struct mds_body, io_epoch) == 88, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, io_epoch));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->io_epoch) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->io_epoch));
-        LASSERTF((int)offsetof(struct mds_body, ino) == 96, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, ino));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->ino) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->ino));
-        LASSERTF((int)offsetof(struct mds_body, valid) == 40, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, valid));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->valid) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->valid));
-        LASSERTF((int)offsetof(struct mds_body, fsuid) == 104, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, fsuid));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fsuid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->fsuid));
-        LASSERTF((int)offsetof(struct mds_body, fsgid) == 108, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, fsgid));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fsgid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->fsgid));
-        LASSERTF((int)offsetof(struct mds_body, capability) == 112, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, capability));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->capability) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->capability));
-        LASSERTF((int)offsetof(struct mds_body, mode) == 116, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, mode));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->mode) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->mode));
-        LASSERTF((int)offsetof(struct mds_body, uid) == 120, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, uid));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->uid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->uid));
-        LASSERTF((int)offsetof(struct mds_body, gid) == 124, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, gid));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->gid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->gid));
-        LASSERTF((int)offsetof(struct mds_body, mtime) == 56, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, mtime));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->mtime) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->mtime));
-        LASSERTF((int)offsetof(struct mds_body, ctime) == 72, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, ctime));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->ctime) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->ctime));
-        LASSERTF((int)offsetof(struct mds_body, atime) == 64, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, atime));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->atime) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->atime));
-        LASSERTF((int)offsetof(struct mds_body, flags) == 128, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, flags));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->flags) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->flags));
-        LASSERTF((int)offsetof(struct mds_body, rdev) == 132, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, rdev));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->rdev) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->rdev));
-        LASSERTF((int)offsetof(struct mds_body, nlink) == 136, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, nlink));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->nlink) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->nlink));
-        LASSERTF((int)offsetof(struct mds_body, generation) == 140, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, generation));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->generation) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->generation));
-        LASSERTF((int)offsetof(struct mds_body, suppgid) == 144, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, suppgid));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->suppgid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->suppgid));
-        LASSERTF((int)offsetof(struct mds_body, eadatasize) == 148, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, eadatasize));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->eadatasize) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->eadatasize));
-        LASSERTF((int)offsetof(struct mds_body, aclsize) == 152, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, aclsize));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->aclsize) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->aclsize));
-        LASSERTF((int)offsetof(struct mds_body, max_mdsize) == 156, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, max_mdsize));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->max_mdsize) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->max_mdsize));
-        LASSERTF((int)offsetof(struct mds_body, max_cookiesize) == 160, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, max_cookiesize));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->max_cookiesize) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->max_cookiesize));
-        LASSERTF((int)offsetof(struct mds_body, padding_4) == 164, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, padding_4));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->padding_4) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->padding_4));
-        LASSERTF(FMODE_READ == 1, " found %lld\n",
-                 (long long)FMODE_READ);
-        LASSERTF(FMODE_WRITE == 2, " found %lld\n",
-                 (long long)FMODE_WRITE);
-        LASSERTF(MDS_FMODE_EXEC == 4, " found %lld\n",
-                 (long long)MDS_FMODE_EXEC);
-        CLASSERT(MDS_OPEN_CREAT == 00000100);
-        CLASSERT(MDS_OPEN_EXCL == 00000200);
-        CLASSERT(MDS_OPEN_TRUNC == 00001000);
-        CLASSERT(MDS_OPEN_APPEND == 00002000);
-        CLASSERT(MDS_OPEN_SYNC == 00010000);
-        CLASSERT(MDS_OPEN_DIRECTORY == 00200000);
-        CLASSERT(MDS_OPEN_DELAY_CREATE == 0100000000);
-        CLASSERT(MDS_OPEN_OWNEROVERRIDE == 0200000000);
-        CLASSERT(MDS_OPEN_JOIN_FILE == 0400000000);
-        CLASSERT(MDS_OPEN_HAS_EA == 010000000000);
-        CLASSERT(MDS_OPEN_HAS_OBJS == 020000000000);
-        CLASSERT(MDS_SYNC_FL == 0x00000008);
-        CLASSERT(MDS_IMMUTABLE_FL == 0x00000010);
-        CLASSERT(MDS_APPEND_FL == 0x00000020);
-        CLASSERT(MDS_NOATIME_FL == 0x00000080);
-        CLASSERT(MDS_DIRSYNC_FL == 0x00010000);
-        CLASSERT(MDS_INODELOCK_LOOKUP == 0x000001);
-        CLASSERT(MDS_INODELOCK_UPDATE == 0x000002);
-        CLASSERT(MDS_INODELOCK_OPEN == 0x000004);
+        /* Checks for struct mdt_body */
+        LASSERTF((int)sizeof(struct mdt_body) == 216, "found %lld\n",
+                 (long long)(int)sizeof(struct mdt_body));
+        LASSERTF((int)offsetof(struct mdt_body, fid1) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, fid1));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->fid1) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->fid1));
+        LASSERTF((int)offsetof(struct mdt_body, fid2) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, fid2));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->fid2) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->fid2));
+        LASSERTF((int)offsetof(struct mdt_body, handle) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, handle));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->handle) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->handle));
+        LASSERTF((int)offsetof(struct mdt_body, valid) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, valid));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->valid) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->valid));
+        LASSERTF((int)offsetof(struct mdt_body, size) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, size));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->size) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->size));
+        LASSERTF((int)offsetof(struct mdt_body, mtime) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, mtime));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->mtime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->mtime));
+        LASSERTF((int)offsetof(struct mdt_body, atime) == 64, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, atime));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->atime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->atime));
+        LASSERTF((int)offsetof(struct mdt_body, ctime) == 72, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, ctime));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->ctime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->ctime));
+        LASSERTF((int)offsetof(struct mdt_body, blocks) == 80, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, blocks));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->blocks) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->blocks));
+        LASSERTF((int)offsetof(struct mdt_body, ino) == 96, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, ino));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->ino) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->ino));
+        LASSERTF((int)offsetof(struct mdt_body, fsuid) == 104, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, fsuid));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->fsuid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->fsuid));
+        LASSERTF((int)offsetof(struct mdt_body, fsgid) == 108, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, fsgid));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->fsgid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->fsgid));
+        LASSERTF((int)offsetof(struct mdt_body, capability) == 112, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, capability));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->capability) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->capability));
+        LASSERTF((int)offsetof(struct mdt_body, mode) == 116, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, mode));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->mode) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->mode));
+        LASSERTF((int)offsetof(struct mdt_body, uid) == 120, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, uid));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->uid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->uid));
+        LASSERTF((int)offsetof(struct mdt_body, gid) == 124, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, gid));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->gid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->gid));
+        LASSERTF((int)offsetof(struct mdt_body, flags) == 128, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, flags));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->flags));
+        LASSERTF((int)offsetof(struct mdt_body, rdev) == 132, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, rdev));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->rdev) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->rdev));
+        LASSERTF((int)offsetof(struct mdt_body, nlink) == 136, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, nlink));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->nlink) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->nlink));
+        LASSERTF((int)offsetof(struct mdt_body, generation) == 140, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, generation));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->generation) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->generation));
+        LASSERTF((int)offsetof(struct mdt_body, suppgid) == 144, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, suppgid));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->suppgid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->suppgid));
+        LASSERTF((int)offsetof(struct mdt_body, eadatasize) == 148, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, eadatasize));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->eadatasize) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->eadatasize));
+        LASSERTF((int)offsetof(struct mdt_body, aclsize) == 152, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, aclsize));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->aclsize) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->aclsize));
+        LASSERTF((int)offsetof(struct mdt_body, max_mdsize) == 156, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, max_mdsize));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->max_mdsize) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->max_mdsize));
+        LASSERTF((int)offsetof(struct mdt_body, max_cookiesize) == 160, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, max_cookiesize));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->max_cookiesize) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->max_cookiesize));
+        LASSERTF((int)offsetof(struct mdt_body, uid_h) == 164, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, uid_h));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->uid_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->uid_h));
+        LASSERTF((int)offsetof(struct mdt_body, gid_h) == 168, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, gid_h));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->gid_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->gid_h));
+        LASSERTF((int)offsetof(struct mdt_body, padding_5) == 172, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, padding_5));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->padding_5) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->padding_5));
+        LASSERTF((int)offsetof(struct mdt_body, padding_6) == 176, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, padding_6));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->padding_6) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->padding_6));
+        LASSERTF((int)offsetof(struct mdt_body, padding_7) == 184, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, padding_7));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->padding_7) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->padding_7));
+        LASSERTF((int)offsetof(struct mdt_body, padding_8) == 192, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, padding_8));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->padding_8) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->padding_8));
+        LASSERTF((int)offsetof(struct mdt_body, padding_9) == 200, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, padding_9));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->padding_9) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->padding_9));
+        LASSERTF((int)offsetof(struct mdt_body, padding_10) == 208, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, padding_10));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->padding_10) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->padding_10));
+        LASSERTF(MDS_FMODE_CLOSED == 000000000000UL, "found 0%.11oUL\n",
+                 MDS_FMODE_CLOSED);
+        LASSERTF(MDS_FMODE_EXEC == 000000000004UL, "found 0%.11oUL\n",
+                 MDS_FMODE_EXEC);
+        LASSERTF(MDS_FMODE_EPOCH == 000001000000UL, "found 0%.11oUL\n",
+                 MDS_FMODE_EPOCH);
+        LASSERTF(MDS_FMODE_TRUNC == 000002000000UL, "found 0%.11oUL\n",
+                 MDS_FMODE_TRUNC);
+        LASSERTF(MDS_FMODE_SOM == 000004000000UL, "found 0%.11oUL\n",
+                 MDS_FMODE_SOM);
+        LASSERTF(MDS_OPEN_CREATED == 000000000010UL, "found 0%.11oUL\n",
+                 MDS_OPEN_CREATED);
+        LASSERTF(MDS_OPEN_CROSS == 000000000020UL, "found 0%.11oUL\n",
+                 MDS_OPEN_CROSS);
+        LASSERTF(MDS_OPEN_CREAT == 000000000100UL, "found 0%.11oUL\n",
+                 MDS_OPEN_CREAT);
+        LASSERTF(MDS_OPEN_EXCL == 000000000200UL, "found 0%.11oUL\n",
+                 MDS_OPEN_EXCL);
+        LASSERTF(MDS_OPEN_TRUNC == 000000001000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_TRUNC);
+        LASSERTF(MDS_OPEN_APPEND == 000000002000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_APPEND);
+        LASSERTF(MDS_OPEN_SYNC == 000000010000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_SYNC);
+        LASSERTF(MDS_OPEN_DIRECTORY == 000000200000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_DIRECTORY);
+        LASSERTF(MDS_OPEN_DELAY_CREATE == 000100000000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_DELAY_CREATE);
+        LASSERTF(MDS_OPEN_OWNEROVERRIDE == 000200000000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_OWNEROVERRIDE);
+        LASSERTF(MDS_OPEN_JOIN_FILE == 000400000000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_JOIN_FILE);
+        LASSERTF(MDS_CREATE_RMT_ACL == 001000000000UL, "found 0%.11oUL\n",
+                 MDS_CREATE_RMT_ACL);
+        LASSERTF(MDS_CREATE_SLAVE_OBJ == 002000000000UL, "found 0%.11oUL\n",
+                 MDS_CREATE_SLAVE_OBJ);
+        LASSERTF(MDS_OPEN_LOCK == 004000000000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_LOCK);
+        LASSERTF(MDS_OPEN_HAS_EA == 010000000000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_HAS_EA);
+        LASSERTF(MDS_OPEN_HAS_OBJS == 020000000000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_HAS_OBJS);
+        LASSERTF(MDS_OPEN_NORESTORE == 00000000000100000000000ULL, "found 0%.22lloULL\n",
+                 (long long)MDS_OPEN_NORESTORE);
+        LASSERTF(MDS_OPEN_NEWSTRIPE == 00000000000200000000000ULL, "found 0%.22lloULL\n",
+                 (long long)MDS_OPEN_NEWSTRIPE);
+        LASSERTF(MDS_SYNC_FL == 0x00000008, "found 0x%.8x\n",
+                 MDS_SYNC_FL);
+        LASSERTF(MDS_IMMUTABLE_FL == 0x00000010, "found 0x%.8x\n",
+                 MDS_IMMUTABLE_FL);
+        LASSERTF(MDS_APPEND_FL == 0x00000020, "found 0x%.8x\n",
+                 MDS_APPEND_FL);
+        LASSERTF(MDS_NOATIME_FL == 0x00000080, "found 0x%.8x\n",
+                 MDS_NOATIME_FL);
+        LASSERTF(MDS_DIRSYNC_FL == 0x00010000, "found 0x%.8x\n",
+                 MDS_DIRSYNC_FL);
+        LASSERTF(MDS_INODELOCK_LOOKUP == 0x000001, "found 0x%.8x\n",
+                 MDS_INODELOCK_LOOKUP);
+        LASSERTF(MDS_INODELOCK_UPDATE == 0x000002, "found 0x%.8x\n",
+                 MDS_INODELOCK_UPDATE);
+        LASSERTF(MDS_INODELOCK_OPEN == 0x000004, "found 0x%.8x\n",
+                 MDS_INODELOCK_OPEN);
+
+        /* Checks for struct mdt_ioepoch */
+        LASSERTF((int)sizeof(struct mdt_ioepoch) == 24, "found %lld\n",
+                 (long long)(int)sizeof(struct mdt_ioepoch));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, handle) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, handle));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->handle) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->handle));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, ioepoch) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, ioepoch));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->ioepoch) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->ioepoch));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, flags) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, flags));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->flags));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, padding) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, padding));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->padding));
+
+        /* Checks for struct mdt_remote_perm */
+        LASSERTF((int)sizeof(struct mdt_remote_perm) == 32, "found %lld\n",
+                 (long long)(int)sizeof(struct mdt_remote_perm));
+        LASSERTF((int)offsetof(struct mdt_remote_perm, rp_uid) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_remote_perm, rp_uid));
+        LASSERTF((int)sizeof(((struct mdt_remote_perm *)0)->rp_uid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_remote_perm *)0)->rp_uid));
+        LASSERTF((int)offsetof(struct mdt_remote_perm, rp_gid) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_remote_perm, rp_gid));
+        LASSERTF((int)sizeof(((struct mdt_remote_perm *)0)->rp_gid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_remote_perm *)0)->rp_gid));
+        LASSERTF((int)offsetof(struct mdt_remote_perm, rp_fsuid) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_remote_perm, rp_fsuid));
+        LASSERTF((int)sizeof(((struct mdt_remote_perm *)0)->rp_fsuid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_remote_perm *)0)->rp_fsuid));
+        LASSERTF((int)offsetof(struct mdt_remote_perm, rp_fsgid) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_remote_perm, rp_fsgid));
+        LASSERTF((int)sizeof(((struct mdt_remote_perm *)0)->rp_fsgid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_remote_perm *)0)->rp_fsgid));
+        LASSERTF((int)offsetof(struct mdt_remote_perm, rp_access_perm) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_remote_perm, rp_access_perm));
+        LASSERTF((int)sizeof(((struct mdt_remote_perm *)0)->rp_access_perm) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_remote_perm *)0)->rp_access_perm));
+        LASSERTF((int)offsetof(struct mdt_remote_perm, rp_padding) == 28, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_remote_perm, rp_padding));
+        LASSERTF((int)sizeof(((struct mdt_remote_perm *)0)->rp_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_remote_perm *)0)->rp_padding));
+        LASSERTF(CFS_SETUID_PERM == 0x00000001UL, "found 0x%.8xUL\n",
+                 (unsigned)CFS_SETUID_PERM);
+        LASSERTF(CFS_SETGID_PERM == 0x00000002UL, "found 0x%.8xUL\n",
+                 (unsigned)CFS_SETGID_PERM);
+        LASSERTF(CFS_SETGRP_PERM == 0x00000004UL, "found 0x%.8xUL\n",
+                 (unsigned)CFS_SETGRP_PERM);
+        LASSERTF(CFS_RMTACL_PERM == 0x00000008UL, "found 0x%.8xUL\n",
+                 (unsigned)CFS_RMTACL_PERM);
+        LASSERTF(CFS_RMTOWN_PERM == 0x00000010UL, "found 0x%.8xUL\n",
+                 (unsigned)CFS_RMTOWN_PERM);
 
         /* Checks for struct mdt_rec_setattr */
-        LASSERTF((int)sizeof(struct mdt_rec_setattr) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mdt_rec_setattr) == 136, "found %lld\n",
                  (long long)(int)sizeof(struct mdt_rec_setattr));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_opcode) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_opcode) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_opcode));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_opcode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_opcode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_opcode));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_cap) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_cap) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_cap));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_cap) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_cap) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_cap));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsuid) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsuid) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsuid));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsuid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsuid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsuid));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsuid_h) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsuid_h) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsuid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsuid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsuid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsuid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsgid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsgid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsgid));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsgid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsgid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsgid));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsgid_h) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fsgid_h) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsgid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsgid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsgid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_fsgid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_suppgid) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_suppgid) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_suppgid));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_suppgid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_suppgid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_suppgid));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_suppgid_h) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_suppgid_h) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_suppgid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_suppgid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_suppgid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_suppgid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_1) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_1) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_padding_1));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_1));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_1_h) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_1_h) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_padding_1_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_1_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_1_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_1_h));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fid) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_fid) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_fid));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_fid) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_fid));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_valid) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_valid) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_valid));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_valid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_valid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_valid));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_uid) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_uid) == 64, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_uid));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_uid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_uid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_uid));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_gid) == 68, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_gid) == 68, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_gid));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_gid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_gid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_gid));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_size) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_size) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_size));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_size) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_size) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_size));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_blocks) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_blocks) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_blocks));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_blocks) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_blocks) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_blocks));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_mtime) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_mtime) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_mtime));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_mtime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_mtime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_mtime));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_atime) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_atime) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_atime));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_atime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_atime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_atime));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_ctime) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_ctime) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_ctime));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_ctime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_ctime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_ctime));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_attr_flags) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_attr_flags) == 112, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_attr_flags));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_attr_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_attr_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_attr_flags));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_mode) == 116, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_mode) == 116, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_mode));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_mode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_mode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_mode));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_2) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_2) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_padding_2));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_2));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_3) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_3) == 124, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_padding_3));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_3) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_3) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_3));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_4) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_4) == 128, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_padding_4));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_4) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_4) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_4));
-        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_5) == 132, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_setattr, sa_padding_5) == 132, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_setattr, sa_padding_5));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_5) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_5) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_5));
 
         /* Checks for struct mdt_rec_create */
-        LASSERTF((int)sizeof(struct mdt_rec_create) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mdt_rec_create) == 136, "found %lld\n",
                  (long long)(int)sizeof(struct mdt_rec_create));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_opcode) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_opcode) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_opcode));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_opcode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_opcode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_opcode));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_cap) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_cap) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_cap));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_cap) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_cap) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_cap));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsuid) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsuid) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_fsuid));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsuid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsuid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fsuid));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsuid_h) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsuid_h) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_fsuid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsuid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsuid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fsuid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsgid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsgid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_fsgid));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsgid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsgid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fsgid));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsgid_h) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fsgid_h) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_fsgid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsgid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fsgid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fsgid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid1) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid1) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid1));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid1_h) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid1_h) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid1_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid1_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid1_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid1_h));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid2) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid2) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid2));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid2_h) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_suppgid2_h) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid2_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid2_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid2_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_suppgid2_h));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fid1) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fid1) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_fid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fid1) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fid1) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fid1));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fid2) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_fid2) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_fid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fid2) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fid2) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fid2));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_old_handle) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_old_handle) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_old_handle));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_old_handle) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_old_handle) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_old_handle));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_time) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_time) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_time));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_time) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_time) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_time));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_rdev) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_rdev) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_rdev));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_rdev) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_rdev) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_rdev));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_ioepoch) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_ioepoch) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_ioepoch));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_ioepoch) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_ioepoch) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_ioepoch));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_padding_1) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_padding_1) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_padding_1));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_padding_1) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_padding_1) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_padding_1));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_mode) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_mode) == 112, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_mode));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_mode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_mode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_mode));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_bias) == 116, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_bias) == 116, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_bias));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_bias) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_bias) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_bias));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_flags_l) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_flags_l) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_flags_l));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_flags_l) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_flags_l) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_flags_l));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_flags_h) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_flags_h) == 124, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_flags_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_flags_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_flags_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_flags_h));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_padding_3) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_padding_3) == 128, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_padding_3));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_padding_3) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_padding_3) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_padding_3));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_padding_4) == 132, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_create, cr_padding_4) == 132, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_create, cr_padding_4));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_padding_4) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_padding_4) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_padding_4));
 
         /* Checks for struct mdt_rec_link */
-        LASSERTF((int)sizeof(struct mdt_rec_link) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mdt_rec_link) == 136, "found %lld\n",
                  (long long)(int)sizeof(struct mdt_rec_link));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_opcode) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_opcode) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_opcode));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_opcode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_opcode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_opcode));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_cap) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_cap) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_cap));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_cap) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_cap) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_cap));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsuid) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsuid) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_fsuid));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsuid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsuid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_fsuid));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsuid_h) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsuid_h) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_fsuid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsuid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsuid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_fsuid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsgid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsgid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_fsgid));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsgid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsgid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_fsgid));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsgid_h) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fsgid_h) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_fsgid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsgid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fsgid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_fsgid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid1) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid1) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid1));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid1_h) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid1_h) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid1_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid1_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid1_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid1_h));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid2) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid2) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid2));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid2_h) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_suppgid2_h) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid2_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid2_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid2_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_suppgid2_h));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fid1) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fid1) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_fid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fid1) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fid1) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_fid1));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fid2) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_fid2) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_fid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fid2) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_fid2) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_fid2));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_time) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_time) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_time));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_time) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_time) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_time));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_1) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_1) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_1));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_1) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_1) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_1));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_2) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_2) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_2));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_2) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_2) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_2));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_3) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_3) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_3));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_3) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_3) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_3));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_4) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_4) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_4));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_4) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_4) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_4));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_bias) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_bias) == 112, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_bias));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_bias) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_bias) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_bias));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_5) == 116, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_5) == 116, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_5));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_5) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_5) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_5));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_6) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_6) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_6));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_6) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_6) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_6));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_7) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_7) == 124, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_7));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_7) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_7) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_7));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_8) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_8) == 128, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_8));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_8) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_8) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_8));
-        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_9) == 132, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_link, lk_padding_9) == 132, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_link, lk_padding_9));
-        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_9) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_link *)0)->lk_padding_9) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_9));
 
         /* Checks for struct mdt_rec_unlink */
-        LASSERTF((int)sizeof(struct mdt_rec_unlink) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mdt_rec_unlink) == 136, "found %lld\n",
                  (long long)(int)sizeof(struct mdt_rec_unlink));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_opcode) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_opcode) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_opcode));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_opcode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_opcode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_opcode));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_cap) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_cap) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_cap));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_cap) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_cap) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_cap));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsuid) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsuid) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsuid));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsuid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsuid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsuid));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsuid_h) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsuid_h) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsuid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsuid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsuid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsuid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsgid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsgid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsgid));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsgid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsgid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsgid));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsgid_h) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fsgid_h) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsgid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsgid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsgid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_fsgid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid1) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid1) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid1));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid1_h) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid1_h) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid1_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid1_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid1_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid1_h));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid2) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid2) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid2));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid2_h) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_suppgid2_h) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid2_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid2_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid2_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_suppgid2_h));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fid1) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fid1) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fid1) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fid1) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_fid1));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fid2) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_fid2) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fid2) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_fid2) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_fid2));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_time) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_time) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_time));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_time) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_time) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_time));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_2) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_2) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_2));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_2) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_2) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_2));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_3) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_3) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_3));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_3) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_3) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_3));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_4) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_4) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_4));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_4) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_4) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_4));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_5) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_5) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_5));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_5) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_5) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_5));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_bias) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_bias) == 112, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_bias));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_bias) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_bias) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_bias));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_mode) == 116, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_mode) == 116, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_mode));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_mode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_mode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_mode));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_6) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_6) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_6));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_6) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_6) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_6));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_7) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_7) == 124, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_7));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_7) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_7) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_7));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_8) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_8) == 128, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_8));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_8) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_8) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_8));
-        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_9) == 132, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_unlink, ul_padding_9) == 132, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_unlink, ul_padding_9));
-        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_9) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_9) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_9));
 
         /* Checks for struct mdt_rec_rename */
-        LASSERTF((int)sizeof(struct mdt_rec_rename) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mdt_rec_rename) == 136, "found %lld\n",
                  (long long)(int)sizeof(struct mdt_rec_rename));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_opcode) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_opcode) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_opcode));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_opcode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_opcode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_opcode));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_cap) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_cap) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_cap));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_cap) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_cap) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_cap));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsuid) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsuid) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_fsuid));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsuid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsuid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_fsuid));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsuid_h) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsuid_h) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_fsuid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsuid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsuid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_fsuid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsgid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsgid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_fsgid));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsgid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsgid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_fsgid));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsgid_h) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fsgid_h) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_fsgid_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsgid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fsgid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_fsgid_h));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid1) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid1) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid1));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid1_h) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid1_h) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid1_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid1_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid1_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid1_h));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid2) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid2) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid2));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid2_h) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_suppgid2_h) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid2_h));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid2_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid2_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_suppgid2_h));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fid1) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fid1) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_fid1));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fid1) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fid1) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_fid1));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fid2) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_fid2) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_fid2));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fid2) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_fid2) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_fid2));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_time) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_time) == 72, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_time));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_time) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_time) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_time));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_1) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_1) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_1));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_1) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_1) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_1));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_2) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_2) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_2));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_2) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_2) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_2));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_3) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_3) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_3));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_3) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_3) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_3));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_4) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_4) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_4));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_4) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_4) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_4));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_bias) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_bias) == 112, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_bias));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_bias) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_bias) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_bias));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_mode) == 116, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_mode) == 116, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_mode));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_mode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_mode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_mode));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_5) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_5) == 120, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_5));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_5) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_5) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_5));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_6) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_6) == 124, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_6));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_6) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_6) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_6));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_7) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_7) == 128, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_7));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_7) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_7) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_7));
-        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_8) == 132, " found %lld\n",
+        LASSERTF((int)offsetof(struct mdt_rec_rename, rn_padding_8) == 132, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_rec_rename, rn_padding_8));
-        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_8) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_8) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_8));
 
+        /* Checks for struct mdt_rec_setxattr */
+        LASSERTF((int)sizeof(struct mdt_rec_setxattr) == 136, "found %lld\n",
+                 (long long)(int)sizeof(struct mdt_rec_setxattr));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_opcode) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_opcode));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_opcode) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_opcode));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_cap) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_cap));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_cap) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_cap));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_fsuid) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_fsuid));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsuid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsuid));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_fsuid_h) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_fsuid_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsuid_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsuid_h));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_fsgid) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_fsgid));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsgid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsgid));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_fsgid_h) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_fsgid_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsgid_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fsgid_h));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_suppgid1) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_suppgid1));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid1) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid1));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_suppgid1_h) == 28, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_suppgid1_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid1_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid1_h));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_suppgid2) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_suppgid2));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid2) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid2));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_suppgid2_h) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_suppgid2_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid2_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_suppgid2_h));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_fid) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_fid));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fid) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_fid));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_1) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_1));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_1) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_1));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_2) == 64, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_2));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_2) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_2));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_3) == 68, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_3));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_3) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_3));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_valid) == 72, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_valid));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_valid) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_valid));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_time) == 80, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_time));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_time) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_time));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_5) == 88, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_5));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_5) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_5));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_6) == 96, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_6));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_6) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_6));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_7) == 104, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_7));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_7) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_7));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_size) == 112, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_size));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_size) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_size));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_flags) == 116, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_flags));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_flags));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_8) == 120, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_8));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_8) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_8));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_9) == 124, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_9));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_9) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_9));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_10) == 128, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_10));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_10) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_10));
+        LASSERTF((int)offsetof(struct mdt_rec_setxattr, sx_padding_11) == 132, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_setxattr, sx_padding_11));
+        LASSERTF((int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_11) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_setxattr *)0)->sx_padding_11));
+
+        /* Checks for struct mdt_rec_reint */
+        LASSERTF((int)sizeof(struct mdt_rec_reint) == 136, "found %lld\n",
+                 (long long)(int)sizeof(struct mdt_rec_reint));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_opcode) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_opcode));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_opcode) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_opcode));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_cap) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_cap));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_cap) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_cap));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_fsuid) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_fsuid));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_fsuid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_fsuid));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_fsuid_h) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_fsuid_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_fsuid_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_fsuid_h));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_fsgid) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_fsgid));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_fsgid) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_fsgid));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_fsgid_h) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_fsgid_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_fsgid_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_fsgid_h));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_suppgid1) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_suppgid1));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid1) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid1));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_suppgid1_h) == 28, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_suppgid1_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid1_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid1_h));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_suppgid2) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_suppgid2));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid2) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid2));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_suppgid2_h) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_suppgid2_h));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid2_h) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_suppgid2_h));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_fid1) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_fid1));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_fid1) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_fid1));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_fid2) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_fid2));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_fid2) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_fid2));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_mtime) == 72, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_mtime));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_mtime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_mtime));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_atime) == 80, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_atime));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_atime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_atime));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_ctime) == 88, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_ctime));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_ctime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_ctime));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_size) == 96, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_size));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_size) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_size));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_blocks) == 104, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_blocks));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_blocks) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_blocks));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_bias) == 112, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_bias));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_bias) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_bias));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_mode) == 116, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_mode));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_mode) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_mode));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_flags) == 120, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_flags));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_flags));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_padding_2) == 124, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_padding_2));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_2) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_2));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_padding_3) == 128, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_padding_3));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_3) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_3));
+        LASSERTF((int)offsetof(struct mdt_rec_reint, rr_padding_4) == 132, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_rec_reint, rr_padding_4));
+        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_4) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_4));
+
+        /* Checks for struct lmv_desc */
+        LASSERTF((int)sizeof(struct lmv_desc) == 88, "found %lld\n",
+                 (long long)(int)sizeof(struct lmv_desc));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_tgt_count) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_tgt_count));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_tgt_count) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_tgt_count));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_active_tgt_count) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_active_tgt_count));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_active_tgt_count) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_active_tgt_count));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_default_stripe_count) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_default_stripe_count));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_default_stripe_count) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_default_stripe_count));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_pattern) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_pattern));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_pattern) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_pattern));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_default_hash_size) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_default_hash_size));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_default_hash_size) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_default_hash_size));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_padding_1) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_padding_1));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_padding_1) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_padding_1));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_padding_2) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_padding_2));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_padding_2) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_padding_2));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_qos_maxage) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_qos_maxage));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_qos_maxage) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_qos_maxage));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_padding_3) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_padding_3));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_padding_3) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_padding_3));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_padding_4) == 44, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_padding_4));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_padding_4) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_padding_4));
+        LASSERTF((int)offsetof(struct lmv_desc, ld_uuid) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_desc, ld_uuid));
+        LASSERTF((int)sizeof(((struct lmv_desc *)0)->ld_uuid) == 40, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_desc *)0)->ld_uuid));
+
+        /* Checks for struct lmv_stripe_md */
+        LASSERTF((int)sizeof(struct lmv_stripe_md) == 32, "found %lld\n",
+                 (long long)(int)sizeof(struct lmv_stripe_md));
+        LASSERTF((int)offsetof(struct lmv_stripe_md, mea_magic) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_stripe_md, mea_magic));
+        LASSERTF((int)sizeof(((struct lmv_stripe_md *)0)->mea_magic) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_stripe_md *)0)->mea_magic));
+        LASSERTF((int)offsetof(struct lmv_stripe_md, mea_count) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_stripe_md, mea_count));
+        LASSERTF((int)sizeof(((struct lmv_stripe_md *)0)->mea_count) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_stripe_md *)0)->mea_count));
+        LASSERTF((int)offsetof(struct lmv_stripe_md, mea_master) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_stripe_md, mea_master));
+        LASSERTF((int)sizeof(((struct lmv_stripe_md *)0)->mea_master) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_stripe_md *)0)->mea_master));
+        LASSERTF((int)offsetof(struct lmv_stripe_md, mea_padding) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_stripe_md, mea_padding));
+        LASSERTF((int)sizeof(((struct lmv_stripe_md *)0)->mea_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_stripe_md *)0)->mea_padding));
+        CLASSERT(LOV_MAXPOOLNAME == 16);
+        LASSERTF((int)offsetof(struct lmv_stripe_md, mea_pool_name[16]) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_stripe_md, mea_pool_name[16]));
+        LASSERTF((int)sizeof(((struct lmv_stripe_md *)0)->mea_pool_name[16]) == 1, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_stripe_md *)0)->mea_pool_name[16]));
+        LASSERTF((int)offsetof(struct lmv_stripe_md, mea_ids[0]) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lmv_stripe_md, mea_ids[0]));
+        LASSERTF((int)sizeof(((struct lmv_stripe_md *)0)->mea_ids[0]) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct lmv_stripe_md *)0)->mea_ids[0]));
+
         /* Checks for struct lov_desc */
-        LASSERTF((int)sizeof(struct lov_desc) == 88, " found %lld\n",
+        LASSERTF((int)sizeof(struct lov_desc) == 88, "found %lld\n",
                  (long long)(int)sizeof(struct lov_desc));
-        LASSERTF((int)offsetof(struct lov_desc, ld_tgt_count) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_tgt_count) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_tgt_count));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_tgt_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_tgt_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_tgt_count));
-        LASSERTF((int)offsetof(struct lov_desc, ld_active_tgt_count) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_active_tgt_count) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_active_tgt_count));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_active_tgt_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_active_tgt_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_active_tgt_count));
-        LASSERTF((int)offsetof(struct lov_desc, ld_default_stripe_count) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_default_stripe_count) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_default_stripe_count));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_default_stripe_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_default_stripe_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_count));
-        LASSERTF((int)offsetof(struct lov_desc, ld_pattern) == 12, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_pattern) == 12, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_pattern));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_pattern) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_pattern) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_pattern));
-        LASSERTF((int)offsetof(struct lov_desc, ld_default_stripe_size) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_default_stripe_size) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_default_stripe_size));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_default_stripe_size) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_default_stripe_size) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_size));
-        LASSERTF((int)offsetof(struct lov_desc, ld_default_stripe_offset) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_default_stripe_offset) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_default_stripe_offset));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset));
-        LASSERTF((int)offsetof(struct lov_desc, ld_qos_maxage) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_padding_0) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lov_desc, ld_padding_0));
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_padding_0) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_0));
+        LASSERTF((int)offsetof(struct lov_desc, ld_qos_maxage) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_qos_maxage));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_qos_maxage) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_qos_maxage) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_qos_maxage));
-        LASSERTF((int)offsetof(struct lov_desc, ld_padding_1) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_padding_1) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_padding_1));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_padding_1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_padding_1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_1));
-        LASSERTF((int)offsetof(struct lov_desc, ld_padding_2) == 44, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_padding_2) == 44, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_padding_2));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_padding_2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_padding_2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_2));
-        LASSERTF((int)offsetof(struct lov_desc, ld_uuid) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_uuid) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_uuid));
-        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_uuid) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_uuid) == 40, "found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_uuid));
+        CLASSERT(LOV_DESC_MAGIC == 0xB0CCDE5C);
 
         /* Checks for struct ldlm_res_id */
-        LASSERTF((int)sizeof(struct ldlm_res_id) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_res_id) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_res_id));
-        LASSERTF((int)offsetof(struct ldlm_res_id, name[4]) == 32, " found %lld\n",
+        CLASSERT(RES_NAME_SIZE == 4);
+        LASSERTF((int)offsetof(struct ldlm_res_id, name[4]) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_res_id, name[4]));
-        LASSERTF((int)sizeof(((struct ldlm_res_id *)0)->name[4]) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_res_id *)0)->name[4]) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_res_id *)0)->name[4]));
 
         /* Checks for struct ldlm_extent */
-        LASSERTF((int)sizeof(struct ldlm_extent) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_extent) == 24, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_extent));
-        LASSERTF((int)offsetof(struct ldlm_extent, start) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_extent, start) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_extent, start));
-        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->start) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->start) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_extent *)0)->start));
-        LASSERTF((int)offsetof(struct ldlm_extent, end) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_extent, end) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_extent, end));
-        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->end) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->end) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_extent *)0)->end));
-        LASSERTF((int)offsetof(struct ldlm_extent, gid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_extent, gid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_extent, gid));
-        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->gid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->gid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_extent *)0)->gid));
 
+        /* Checks for struct ldlm_inodebits */
+        LASSERTF((int)sizeof(struct ldlm_inodebits) == 8, "found %lld\n",
+                 (long long)(int)sizeof(struct ldlm_inodebits));
+        LASSERTF((int)offsetof(struct ldlm_inodebits, bits) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_inodebits, bits));
+        LASSERTF((int)sizeof(((struct ldlm_inodebits *)0)->bits) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_inodebits *)0)->bits));
+
         /* Checks for struct ldlm_flock_wire */
-        LASSERTF((int)sizeof(struct ldlm_flock_wire) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_flock_wire) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_flock_wire));
-        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_start) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_start) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_flock_wire, lfw_start));
-        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_start) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_start) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_start));
-        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_end) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_end) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_flock_wire, lfw_end));
-        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_end) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_end) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_end));
-        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_owner) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_owner) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_flock_wire, lfw_owner));
-        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_owner) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_owner) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_owner));
-        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_pid) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_padding) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_flock_wire, lfw_padding));
+        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_padding));
+        LASSERTF((int)offsetof(struct ldlm_flock_wire, lfw_pid) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_flock_wire, lfw_pid));
-        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_pid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_flock_wire *)0)->lfw_pid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_pid));
 
-        /* Checks for struct ldlm_inodebits */
-        LASSERTF((int)sizeof(struct ldlm_inodebits) == 8, " found %lld\n",
-                 (long long)(int)sizeof(struct ldlm_inodebits));
-        LASSERTF((int)offsetof(struct ldlm_inodebits, bits) == 0, " found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_inodebits, bits));
-        LASSERTF((int)sizeof(((struct ldlm_inodebits *)0)->bits) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_inodebits *)0)->bits));
-
         /* Checks for struct ldlm_intent */
-        LASSERTF((int)sizeof(struct ldlm_intent) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_intent) == 8, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_intent));
-        LASSERTF((int)offsetof(struct ldlm_intent, opc) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_intent, opc) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_intent, opc));
-        LASSERTF((int)sizeof(((struct ldlm_intent *)0)->opc) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_intent *)0)->opc) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_intent *)0)->opc));
 
         /* Checks for struct ldlm_resource_desc */
-        LASSERTF((int)sizeof(struct ldlm_resource_desc) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_resource_desc) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_resource_desc));
-        LASSERTF((int)offsetof(struct ldlm_resource_desc, lr_type) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_resource_desc, lr_type) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_resource_desc, lr_type));
-        LASSERTF((int)sizeof(((struct ldlm_resource_desc *)0)->lr_type) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_resource_desc *)0)->lr_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_type));
-        LASSERTF((int)offsetof(struct ldlm_resource_desc, lr_padding) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_resource_desc, lr_padding) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_resource_desc, lr_padding));
-        LASSERTF((int)sizeof(((struct ldlm_resource_desc *)0)->lr_padding) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_resource_desc *)0)->lr_padding) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_padding));
-        LASSERTF((int)offsetof(struct ldlm_resource_desc, lr_name) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_resource_desc, lr_name) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_resource_desc, lr_name));
-        LASSERTF((int)sizeof(((struct ldlm_resource_desc *)0)->lr_name) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_resource_desc *)0)->lr_name) == 32, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_name));
 
         /* Checks for struct ldlm_lock_desc */
-        LASSERTF((int)sizeof(struct ldlm_lock_desc) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_lock_desc) == 80, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_lock_desc));
-        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_resource) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_resource) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_lock_desc, l_resource));
-        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_resource) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_resource) == 40, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_resource));
-        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_req_mode) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_req_mode) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_lock_desc, l_req_mode));
-        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_req_mode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_req_mode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_req_mode));
-        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_granted_mode) == 44, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_granted_mode) == 44, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_lock_desc, l_granted_mode));
-        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_granted_mode) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_granted_mode) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_granted_mode));
-        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_policy_data) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_lock_desc, l_policy_data) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_lock_desc, l_policy_data));
-        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data) == 32, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data));
 
         /* Checks for struct ldlm_request */
-        LASSERTF((int)sizeof(struct ldlm_request) == 104, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_request) == 104, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_request));
-        LASSERTF((int)offsetof(struct ldlm_request, lock_flags) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_request, lock_flags) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_flags));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_flags));
-        LASSERTF((int)offsetof(struct ldlm_request, lock_count) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_request, lock_count) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_count));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_count));
-        LASSERTF((int)offsetof(struct ldlm_request, lock_desc) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_request, lock_desc) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_desc));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 80, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_desc));
-        LASSERTF((int)offsetof(struct ldlm_request, lock_handle) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_request, lock_handle) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_handle));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle));
 
         /* Checks for struct ldlm_reply */
-        LASSERTF((int)sizeof(struct ldlm_reply) == 112, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_reply) == 112, "found %lld\n",
                  (long long)(int)sizeof(struct ldlm_reply));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_flags) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_flags) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_flags));
-        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_flags));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_padding) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_padding) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_padding));
-        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_padding) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_padding) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_padding));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_desc) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_desc) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_desc));
-        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_desc) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_desc) == 80, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_desc));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_handle) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_handle) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_handle));
-        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_handle) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_handle) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_handle));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res1) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res1) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_policy_res1));
-        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res2) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res2) == 104, "found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_policy_res2));
-        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2));
 
         /* Checks for struct ost_lvb */
-        LASSERTF((int)sizeof(struct ost_lvb) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct ost_lvb) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct ost_lvb));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_size) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_size) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ost_lvb, lvb_size));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_size) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_size) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_size));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_mtime) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_mtime) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct ost_lvb, lvb_mtime));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_mtime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_mtime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_atime) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_atime) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct ost_lvb, lvb_atime));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_atime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_atime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_ctime) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_ctime) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct ost_lvb, lvb_ctime));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_ctime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_ctime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_blocks) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_blocks) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct ost_lvb, lvb_blocks));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_blocks) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_blocks) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
 
+        /* Checks for struct mgs_send_param */
+        LASSERTF((int)sizeof(struct mgs_send_param) == 1024, "found %lld\n",
+                 (long long)(int)sizeof(struct mgs_send_param));
+        CLASSERT(MGS_PARAM_MAXLEN == 1024);
+        LASSERTF((int)offsetof(struct mgs_send_param, mgs_param[1024]) == 1024, "found %lld\n",
+                 (long long)(int)offsetof(struct mgs_send_param, mgs_param[1024]));
+        LASSERTF((int)sizeof(((struct mgs_send_param *)0)->mgs_param[1024]) == 1, "found %lld\n",
+                 (long long)(int)sizeof(((struct mgs_send_param *)0)->mgs_param[1024]));
+
         /* Checks for struct cfg_marker */
-        LASSERTF((int)sizeof(struct cfg_marker) == 160, " found %lld\n",
+        LASSERTF((int)sizeof(struct cfg_marker) == 160, "found %lld\n",
                  (long long)(int)sizeof(struct cfg_marker));
-        LASSERTF((int)offsetof(struct cfg_marker, cm_step) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct cfg_marker, cm_step) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct cfg_marker, cm_step));
-        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_step) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_step) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct cfg_marker *)0)->cm_step));
-        LASSERTF((int)offsetof(struct cfg_marker, cm_flags) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct cfg_marker, cm_flags) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct cfg_marker, cm_flags));
-        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct cfg_marker *)0)->cm_flags));
-        LASSERTF((int)offsetof(struct cfg_marker, cm_vers) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct cfg_marker, cm_vers) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct cfg_marker, cm_vers));
-        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_vers) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_vers) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct cfg_marker *)0)->cm_vers));
-        LASSERTF((int)offsetof(struct cfg_marker, cm_createtime) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct cfg_marker, cm_padding) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_padding));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_padding));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_createtime) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct cfg_marker, cm_createtime));
-        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_createtime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_createtime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct cfg_marker *)0)->cm_createtime));
-        LASSERTF((int)offsetof(struct cfg_marker, cm_canceltime) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct cfg_marker, cm_canceltime) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct cfg_marker, cm_canceltime));
-        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_canceltime) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_canceltime) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct cfg_marker *)0)->cm_canceltime));
-        LASSERTF((int)offsetof(struct cfg_marker, cm_tgtname) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct cfg_marker, cm_tgtname) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct cfg_marker, cm_tgtname));
-        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_tgtname) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_tgtname) == 64, "found %lld\n",
                  (long long)(int)sizeof(((struct cfg_marker *)0)->cm_tgtname));
-        LASSERTF((int)offsetof(struct cfg_marker, cm_comment) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct cfg_marker, cm_comment) == 96, "found %lld\n",
                  (long long)(int)offsetof(struct cfg_marker, cm_comment));
-        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_comment) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_comment) == 64, "found %lld\n",
                  (long long)(int)sizeof(((struct cfg_marker *)0)->cm_comment));
 
         /* Checks for struct llog_logid */
-        LASSERTF((int)sizeof(struct llog_logid) == 20, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_logid) == 20, "found %lld\n",
                  (long long)(int)sizeof(struct llog_logid));
-        LASSERTF((int)offsetof(struct llog_logid, lgl_oid) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_logid, lgl_oid) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid, lgl_oid));
-        LASSERTF((int)sizeof(((struct llog_logid *)0)->lgl_oid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid *)0)->lgl_oid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid *)0)->lgl_oid));
-        LASSERTF((int)offsetof(struct llog_logid, lgl_oseq) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_logid, lgl_oseq) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid, lgl_oseq));
-        LASSERTF((int)sizeof(((struct llog_logid *)0)->lgl_oseq) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid *)0)->lgl_oseq) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid *)0)->lgl_oseq));
-        LASSERTF((int)offsetof(struct llog_logid, lgl_ogen) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_logid, lgl_ogen) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid, lgl_ogen));
-        LASSERTF((int)sizeof(((struct llog_logid *)0)->lgl_ogen) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid *)0)->lgl_ogen) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid *)0)->lgl_ogen));
         CLASSERT(OST_SZ_REC == 274730752);
         CLASSERT(OST_RAID1_REC == 274731008);
@@ -1973,443 +2845,479 @@ void lustre_assert_wire_constants(void)
         CLASSERT(LLOG_LOGID_MAGIC == 275010875);
 
         /* Checks for struct llog_catid */
-        LASSERTF((int)sizeof(struct llog_catid) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_catid) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct llog_catid));
-        LASSERTF((int)offsetof(struct llog_catid, lci_logid) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_catid, lci_logid) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_catid, lci_logid));
-        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_logid) == 20, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_logid) == 20, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_catid *)0)->lci_logid));
-        LASSERTF((int)offsetof(struct llog_catid, lci_padding1) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_catid, lci_padding1) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct llog_catid, lci_padding1));
-        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_padding1) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_padding1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_catid *)0)->lci_padding1));
-        LASSERTF((int)offsetof(struct llog_catid, lci_padding2) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_catid, lci_padding2) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_catid, lci_padding2));
-        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_padding2) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_padding2) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_catid *)0)->lci_padding2));
-        LASSERTF((int)offsetof(struct llog_catid, lci_padding3) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_catid, lci_padding3) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct llog_catid, lci_padding3));
-        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_padding3) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_catid *)0)->lci_padding3) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_catid *)0)->lci_padding3));
 
         /* Checks for struct llog_rec_hdr */
-        LASSERTF((int)sizeof(struct llog_rec_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_rec_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(struct llog_rec_hdr));
-        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_len) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_len) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_rec_hdr, lrh_len));
-        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_len) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_len) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_len));
-        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_index) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_index) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct llog_rec_hdr, lrh_index));
-        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_index) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_index) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_index));
-        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_type) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_type) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct llog_rec_hdr, lrh_type));
-        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_type) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_type));
-        LASSERTF((int)offsetof(struct llog_rec_hdr, padding) == 12, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_rec_hdr, padding));
-        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->padding));
+        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_padding) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_rec_hdr, lrh_padding));
+        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_padding));
 
         /* Checks for struct llog_rec_tail */
-        LASSERTF((int)sizeof(struct llog_rec_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_rec_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(struct llog_rec_tail));
-        LASSERTF((int)offsetof(struct llog_rec_tail, lrt_len) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_rec_tail, lrt_len) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_rec_tail, lrt_len));
-        LASSERTF((int)sizeof(((struct llog_rec_tail *)0)->lrt_len) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_rec_tail *)0)->lrt_len) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_rec_tail *)0)->lrt_len));
-        LASSERTF((int)offsetof(struct llog_rec_tail, lrt_index) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_rec_tail, lrt_index) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct llog_rec_tail, lrt_index));
-        LASSERTF((int)sizeof(((struct llog_rec_tail *)0)->lrt_index) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_rec_tail *)0)->lrt_index) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_rec_tail *)0)->lrt_index));
 
         /* Checks for struct llog_logid_rec */
-        LASSERTF((int)sizeof(struct llog_logid_rec) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_logid_rec) == 64, "found %lld\n",
                  (long long)(int)sizeof(struct llog_logid_rec));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid_rec, lid_hdr));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_hdr));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_id) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_id) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid_rec, lid_id));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_id) == 20, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_id) == 20, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_id));
-        LASSERTF((int)offsetof(struct llog_logid_rec, padding1) == 36, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, padding1));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->padding1) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->padding1));
-        LASSERTF((int)offsetof(struct llog_logid_rec, padding2) == 40, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, padding2));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->padding2) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->padding2));
-        LASSERTF((int)offsetof(struct llog_logid_rec, padding3) == 44, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, padding3));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->padding3) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->padding3));
-        LASSERTF((int)offsetof(struct llog_logid_rec, padding4) == 48, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, padding4));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->padding4) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->padding4));
-        LASSERTF((int)offsetof(struct llog_logid_rec, padding5) == 52, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, padding5));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->padding5) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->padding5));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_tail) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding1) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding1));
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding1) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding1));
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding2) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding2));
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding2) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding2));
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding3) == 44, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding3));
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding3) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding3));
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding4) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding4));
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding4) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding4));
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding5) == 52, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding5));
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding5) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding5));
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_tail) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid_rec, lid_tail));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_tail));
 
         /* Checks for struct llog_create_rec */
-        LASSERTF((int)sizeof(struct llog_create_rec) == 56, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_create_rec) == 56, "found %lld\n",
                  (long long)(int)sizeof(struct llog_create_rec));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_create_rec, lcr_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_create_rec, lcr_hdr));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_hdr));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_fid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_create_rec, lcr_fid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_create_rec, lcr_fid));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_fid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_fid) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_fid));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_oid) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_create_rec, lcr_oid) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_create_rec, lcr_oid));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_oid));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_oseq) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_create_rec, lcr_oseq) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct llog_create_rec, lcr_oseq));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oseq) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oseq) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_oseq));
-        LASSERTF((int)offsetof(struct llog_create_rec, padding) == 44, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_create_rec, padding));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_create_rec *)0)->padding));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_tail) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_create_rec, lcr_padding) == 44, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_create_rec, lcr_padding));
+        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_padding));
+        LASSERTF((int)offsetof(struct llog_create_rec, lcr_tail) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct llog_create_rec, lcr_tail));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_tail));
 
         /* Checks for struct llog_orphan_rec */
-        LASSERTF((int)sizeof(struct llog_orphan_rec) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_orphan_rec) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct llog_orphan_rec));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_orphan_rec, lor_hdr));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_hdr));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_oid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_oid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_orphan_rec, lor_oid));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_oid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_oid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_oid));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_ogen) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_ogen) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_orphan_rec, lor_ogen));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_ogen) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_ogen) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_ogen));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, padding) == 28, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_orphan_rec, padding));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_orphan_rec *)0)->padding));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_tail) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_padding) == 28, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_orphan_rec, lor_padding));
+        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_padding));
+        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_tail) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_orphan_rec, lor_tail));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_tail));
 
         /* Checks for struct llog_unlink_rec */
-        LASSERTF((int)sizeof(struct llog_unlink_rec) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_unlink_rec) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct llog_unlink_rec));
-        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_unlink_rec, lur_hdr));
-        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_hdr));
-        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_oid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_oid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_unlink_rec, lur_oid));
-        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_oid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_oid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_oid));
-        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_oseq) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_oseq) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_unlink_rec, lur_oseq));
-        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_oseq) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_oseq) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_oseq));
-        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_count) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_count) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct llog_unlink_rec, lur_count));
-        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_count));
-        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_tail) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_unlink_rec, lur_tail) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_unlink_rec, lur_tail));
-        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_tail));
 
         /* Checks for struct llog_setattr_rec */
-        LASSERTF((int)sizeof(struct llog_setattr_rec) == 48, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_setattr_rec) == 48, "found %lld\n",
                  (long long)(int)sizeof(struct llog_setattr_rec));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr_rec, lsr_hdr));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_hdr));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_oid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_oid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr_rec, lsr_oid));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_oseq) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_oseq) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr_rec, lsr_oseq));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oseq) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oseq) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_oseq));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_uid) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_uid) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr_rec, lsr_uid));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_uid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_uid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_uid));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_gid) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_gid) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr_rec, lsr_gid));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_gid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_gid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_gid));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, padding) == 36, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, padding));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->padding));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_tail) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_padding) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_padding));
+        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_padding));
+        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_tail) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr_rec, lsr_tail));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_tail));
 
         /* Checks for struct llog_setattr64_rec */
-        LASSERTF((int)sizeof(struct llog_setattr64_rec) == 56, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_setattr64_rec) == 56, "found %lld\n",
                  (long long)(int)sizeof(struct llog_setattr64_rec));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_hdr));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_oid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_oid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_oid));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_oseq) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_oseq) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_oseq));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, padding) == 28, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr64_rec, padding));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->padding));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_uid) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_padding) == 28, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_padding));
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding));
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_uid) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_uid));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_uid_h) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_uid_h) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_uid_h));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid_h));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_gid) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_gid) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_gid));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_gid_h) == 44, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_gid_h) == 44, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_gid_h));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_tail));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail));
 
         /* Checks for struct llog_size_change_rec */
-        LASSERTF((int)sizeof(struct llog_size_change_rec) == 48, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_size_change_rec) == 48, "found %lld\n",
                  (long long)(int)sizeof(struct llog_size_change_rec));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_hdr));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_hdr));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_fid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_fid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_fid));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_fid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_fid) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_fid));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_ioepoch) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_ioepoch) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_ioepoch));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, padding) == 36, " found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, padding));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->padding));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding));
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding));
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_tail));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_tail));
 
         /* Checks for struct changelog_rec */
-        LASSERTF((int)sizeof(struct changelog_rec) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(struct changelog_rec) == 64, "found %lld\n",
                  (long long)(int)sizeof(struct changelog_rec));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_namelen) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_namelen) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_namelen));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_namelen) == 2, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_namelen) == 2, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_namelen));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_flags) == 2, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_flags) == 2, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_flags));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_flags) == 2, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_flags) == 2, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_flags));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_type) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_type) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_type));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_type) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_type));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_index) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_index) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_index));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_index) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_index) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_index));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_prev) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_prev) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_prev));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_prev) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_prev) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_prev));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_time) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_time) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_time));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_time) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_time) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_time));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_tfid) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_tfid) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_tfid));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_tfid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_tfid) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_tfid));
-        LASSERTF((int)offsetof(struct changelog_rec, cr_pfid) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct changelog_rec, cr_pfid) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct changelog_rec, cr_pfid));
-        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_pfid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct changelog_rec *)0)->cr_pfid) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct changelog_rec *)0)->cr_pfid));
 
+        /* Checks for struct changelog_setinfo */
+        LASSERTF((int)sizeof(struct changelog_setinfo) == 12, "found %lld\n",
+                 (long long)(int)sizeof(struct changelog_setinfo));
+        LASSERTF((int)offsetof(struct changelog_setinfo, cs_recno) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct changelog_setinfo, cs_recno));
+        LASSERTF((int)sizeof(((struct changelog_setinfo *)0)->cs_recno) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct changelog_setinfo *)0)->cs_recno));
+        LASSERTF((int)offsetof(struct changelog_setinfo, cs_id) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct changelog_setinfo, cs_id));
+        LASSERTF((int)sizeof(((struct changelog_setinfo *)0)->cs_id) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct changelog_setinfo *)0)->cs_id));
+
         /* Checks for struct llog_changelog_rec */
-        LASSERTF((int)sizeof(struct llog_changelog_rec) == 88, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_changelog_rec) == 88, "found %lld\n",
                  (long long)(int)sizeof(struct llog_changelog_rec));
-        LASSERTF((int)offsetof(struct llog_changelog_rec, cr_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_changelog_rec, cr_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_changelog_rec, cr_hdr));
-        LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_hdr));
-        LASSERTF((int)offsetof(struct llog_changelog_rec, cr) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_changelog_rec, cr) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_changelog_rec, cr));
-        LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr) == 64, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr));
-        LASSERTF((int)offsetof(struct llog_changelog_rec, cr_tail) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_changelog_rec, cr_tail) == 80, "found %lld\n",
                  (long long)(int)offsetof(struct llog_changelog_rec, cr_tail));
-        LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_tail));
 
+        /* Checks for struct llog_changelog_user_rec */
+        LASSERTF((int)sizeof(struct llog_changelog_user_rec) == 40, "found %lld\n",
+                 (long long)(int)sizeof(struct llog_changelog_user_rec));
+        LASSERTF((int)offsetof(struct llog_changelog_user_rec, cur_hdr) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_changelog_user_rec, cur_hdr));
+        LASSERTF((int)sizeof(((struct llog_changelog_user_rec *)0)->cur_hdr) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_changelog_user_rec *)0)->cur_hdr));
+        LASSERTF((int)offsetof(struct llog_changelog_user_rec, cur_id) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_changelog_user_rec, cur_id));
+        LASSERTF((int)sizeof(((struct llog_changelog_user_rec *)0)->cur_id) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_changelog_user_rec *)0)->cur_id));
+        LASSERTF((int)offsetof(struct llog_changelog_user_rec, cur_padding) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_changelog_user_rec, cur_padding));
+        LASSERTF((int)sizeof(((struct llog_changelog_user_rec *)0)->cur_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_changelog_user_rec *)0)->cur_padding));
+        LASSERTF((int)offsetof(struct llog_changelog_user_rec, cur_endrec) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_changelog_user_rec, cur_endrec));
+        LASSERTF((int)sizeof(((struct llog_changelog_user_rec *)0)->cur_endrec) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_changelog_user_rec *)0)->cur_endrec));
+        LASSERTF((int)offsetof(struct llog_changelog_user_rec, cur_tail) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_changelog_user_rec, cur_tail));
+        LASSERTF((int)sizeof(((struct llog_changelog_user_rec *)0)->cur_tail) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_changelog_user_rec *)0)->cur_tail));
+
         /* Checks for struct llog_gen */
-        LASSERTF((int)sizeof(struct llog_gen) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_gen) == 16, "found %lld\n",
                  (long long)(int)sizeof(struct llog_gen));
-        LASSERTF((int)offsetof(struct llog_gen, mnt_cnt) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_gen, mnt_cnt) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_gen, mnt_cnt));
-        LASSERTF((int)sizeof(((struct llog_gen *)0)->mnt_cnt) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_gen *)0)->mnt_cnt) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_gen *)0)->mnt_cnt));
-        LASSERTF((int)offsetof(struct llog_gen, conn_cnt) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_gen, conn_cnt) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct llog_gen, conn_cnt));
-        LASSERTF((int)sizeof(((struct llog_gen *)0)->conn_cnt) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_gen *)0)->conn_cnt) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_gen *)0)->conn_cnt));
 
         /* Checks for struct llog_gen_rec */
-        LASSERTF((int)sizeof(struct llog_gen_rec) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_gen_rec) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct llog_gen_rec));
-        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_gen_rec, lgr_hdr));
-        LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_hdr));
-        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_gen) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_gen) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_gen_rec, lgr_gen));
-        LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_gen) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_gen) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_gen));
-        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_gen_rec, lgr_tail));
-        LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_tail));
 
         /* Checks for struct llog_log_hdr */
-        LASSERTF((int)sizeof(struct llog_log_hdr) == 8192, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_log_hdr) == 8192, "found %lld\n",
                  (long long)(int)sizeof(struct llog_log_hdr));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_hdr) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_hdr));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_hdr) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_hdr) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_hdr));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_timestamp) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_timestamp) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_timestamp));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_timestamp) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_timestamp) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_timestamp));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_count) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_count) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_count));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_count) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_count) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_count));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_bitmap_offset) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_bitmap_offset) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_bitmap_offset));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap_offset) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap_offset) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap_offset));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_size) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_size) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_size));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_size) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_size) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_size));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_flags) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_flags) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_flags));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_flags));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_cat_idx) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_cat_idx) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_cat_idx));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_cat_idx) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_cat_idx) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_cat_idx));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_tgtuuid) == 44, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_tgtuuid) == 44, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_tgtuuid));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_tgtuuid) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_tgtuuid) == 40, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_tgtuuid));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_reserved) == 84, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_reserved) == 84, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_reserved));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_reserved) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_reserved) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_reserved));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_bitmap) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_bitmap) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_bitmap));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap) == 8096, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap) == 8096, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap));
-        LASSERTF((int)offsetof(struct llog_log_hdr, llh_tail) == 8184, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_tail) == 8184, "found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_tail));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_tail) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_tail));
 
         /* Checks for struct llog_cookie */
-        LASSERTF((int)sizeof(struct llog_cookie) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_cookie) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct llog_cookie));
-        LASSERTF((int)offsetof(struct llog_cookie, lgc_lgl) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_cookie, lgc_lgl) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_cookie, lgc_lgl));
-        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_lgl) == 20, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_lgl) == 20, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_lgl));
-        LASSERTF((int)offsetof(struct llog_cookie, lgc_subsys) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_cookie, lgc_subsys) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct llog_cookie, lgc_subsys));
-        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_subsys) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_subsys) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_subsys));
-        LASSERTF((int)offsetof(struct llog_cookie, lgc_index) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_cookie, lgc_index) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_cookie, lgc_index));
-        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_index) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_index) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_index));
-        LASSERTF((int)offsetof(struct llog_cookie, lgc_padding) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_cookie, lgc_padding) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct llog_cookie, lgc_padding));
-        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_padding) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_cookie *)0)->lgc_padding) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_padding));
 
         /* Checks for struct llogd_body */
-        LASSERTF((int)sizeof(struct llogd_body) == 48, " found %lld\n",
+        LASSERTF((int)sizeof(struct llogd_body) == 48, "found %lld\n",
                  (long long)(int)sizeof(struct llogd_body));
-        LASSERTF((int)offsetof(struct llogd_body, lgd_logid) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_body, lgd_logid) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_body, lgd_logid));
-        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_logid) == 20, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_logid) == 20, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_body *)0)->lgd_logid));
-        LASSERTF((int)offsetof(struct llogd_body, lgd_ctxt_idx) == 20, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_body, lgd_ctxt_idx) == 20, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_body, lgd_ctxt_idx));
-        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_ctxt_idx) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_ctxt_idx) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_body *)0)->lgd_ctxt_idx));
-        LASSERTF((int)offsetof(struct llogd_body, lgd_llh_flags) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_body, lgd_llh_flags) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_body, lgd_llh_flags));
-        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_llh_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_llh_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_body *)0)->lgd_llh_flags));
-        LASSERTF((int)offsetof(struct llogd_body, lgd_index) == 28, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_body, lgd_index) == 28, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_body, lgd_index));
-        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_index) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_index) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_body *)0)->lgd_index));
-        LASSERTF((int)offsetof(struct llogd_body, lgd_saved_index) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_body, lgd_saved_index) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_body, lgd_saved_index));
-        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_saved_index) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_saved_index) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_body *)0)->lgd_saved_index));
-        LASSERTF((int)offsetof(struct llogd_body, lgd_len) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_body, lgd_len) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_body, lgd_len));
-        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_len) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_len) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_body *)0)->lgd_len));
-        LASSERTF((int)offsetof(struct llogd_body, lgd_cur_offset) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_body, lgd_cur_offset) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_body, lgd_cur_offset));
-        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_cur_offset) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_cur_offset) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_body *)0)->lgd_cur_offset));
         CLASSERT(LLOG_ORIGIN_HANDLE_CREATE == 501);
         CLASSERT(LLOG_ORIGIN_HANDLE_NEXT_BLOCK == 502);
@@ -2420,232 +3328,340 @@ void lustre_assert_wire_constants(void)
         CLASSERT(LLOG_CATINFO == 507);
         CLASSERT(LLOG_ORIGIN_HANDLE_PREV_BLOCK == 508);
         CLASSERT(LLOG_ORIGIN_HANDLE_DESTROY == 509);
+        CLASSERT(LLOG_FIRST_OPC == 501);
+        CLASSERT(LLOG_LAST_OPC == 510);
 
         /* Checks for struct llogd_conn_body */
-        LASSERTF((int)sizeof(struct llogd_conn_body) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct llogd_conn_body) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct llogd_conn_body));
-        LASSERTF((int)offsetof(struct llogd_conn_body, lgdc_gen) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_conn_body, lgdc_gen) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_conn_body, lgdc_gen));
-        LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_gen) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_gen) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_gen));
-        LASSERTF((int)offsetof(struct llogd_conn_body, lgdc_logid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_conn_body, lgdc_logid) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_conn_body, lgdc_logid));
-        LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_logid) == 20, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_logid) == 20, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_logid));
-        LASSERTF((int)offsetof(struct llogd_conn_body, lgdc_ctxt_idx) == 36, " found %lld\n",
+        LASSERTF((int)offsetof(struct llogd_conn_body, lgdc_ctxt_idx) == 36, "found %lld\n",
                  (long long)(int)offsetof(struct llogd_conn_body, lgdc_ctxt_idx));
-        LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
 
+        /* Checks for struct ll_fiemap_info_key */
+        LASSERTF((int)sizeof(struct ll_fiemap_info_key) == 248, "found %lld\n",
+                 (long long)(int)sizeof(struct ll_fiemap_info_key));
+        LASSERTF((int)offsetof(struct ll_fiemap_info_key, name[8]) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct ll_fiemap_info_key, name[8]));
+        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->name[8]) == 1, "found %lld\n",
+                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->name[8]));
+        LASSERTF((int)offsetof(struct ll_fiemap_info_key, oa) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct ll_fiemap_info_key, oa));
+        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->oa) == 208, "found %lld\n",
+                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->oa));
+        LASSERTF((int)offsetof(struct ll_fiemap_info_key, fiemap) == 216, "found %lld\n",
+                 (long long)(int)offsetof(struct ll_fiemap_info_key, fiemap));
+        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->fiemap) == 32, "found %lld\n",
+                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->fiemap));
+
         /* Checks for struct qunit_data */
-        LASSERTF((int)sizeof(struct qunit_data) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct qunit_data) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct qunit_data));
-        LASSERTF((int)offsetof(struct qunit_data, qd_id) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct qunit_data, qd_id) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct qunit_data, qd_id));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_id) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_id) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct qunit_data *)0)->qd_id));
-        LASSERTF((int)offsetof(struct qunit_data, qd_flags) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct qunit_data, qd_flags) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct qunit_data, qd_flags));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct qunit_data *)0)->qd_flags));
-        LASSERTF((int)offsetof(struct qunit_data, qd_count) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct qunit_data, qd_count) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct qunit_data, qd_count));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_count) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_count) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct qunit_data *)0)->qd_count));
-        LASSERTF((int)offsetof(struct qunit_data, qd_qunit) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct qunit_data, qd_qunit) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct qunit_data, qd_qunit));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_qunit) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_qunit) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct qunit_data *)0)->qd_qunit));
-        LASSERTF((int)offsetof(struct qunit_data, padding) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct qunit_data, padding) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct qunit_data, padding));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->padding) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct qunit_data *)0)->padding) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct qunit_data *)0)->padding));
 
         /* Checks for struct quota_adjust_qunit */
-        LASSERTF((int)sizeof(struct quota_adjust_qunit) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct quota_adjust_qunit) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct quota_adjust_qunit));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_flags) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_flags) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct quota_adjust_qunit, qaq_flags));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_flags) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_flags) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_flags));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_id) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_id) == 4, "found %lld\n",
                  (long long)(int)offsetof(struct quota_adjust_qunit, qaq_id));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_id) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_id) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_id));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_bunit_sz) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_bunit_sz) == 8, "found %lld\n",
                  (long long)(int)offsetof(struct quota_adjust_qunit, qaq_bunit_sz));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_bunit_sz) == 8, " found %lld\n",
+        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_bunit_sz) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_bunit_sz));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_iunit_sz) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_iunit_sz) == 16, "found %lld\n",
                  (long long)(int)offsetof(struct quota_adjust_qunit, qaq_iunit_sz));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)-&