Whamcloud - gitweb
LU-2062 hsm: llapi hsm calls for CopyTool
authorjcl <jacques-charles.lafoucriere@cea.fr>
Mon, 3 Dec 2012 20:13:13 +0000 (21:13 +0100)
committerOleg Drokin <green@whamcloud.com>
Wed, 30 Jan 2013 19:25:48 +0000 (14:25 -0500)
llapi hsm calls for CopyTool
- llapi_hsm_copytool_start()
- llapi_hsm_copytool_fini()
- llapi_hsm_copytool_recv()
- llapi_hsm_copytool_free()
- llapi_hsm_copy_start()
- llapi_hsm_copy_end()
- llapi_hsm_progress()
- llapi_hsm_import()

and related MDT functions
- mdt_hsm_ct_register()
- mdt_hsm_ct_unregister()
- mdt_hsm_progress()

The new RPC are:
- MDS_HSM_CT_REGISTER
- MDS_HSM_CT_UNREGISTER
- MDS_HSM_PROGRESS

Signed-off-by: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Change-Id: I93617ac6e66a3324344b57f1a22d7c851d715262
Reviewed-on: http://review.whamcloud.com/4736
Tested-by: Hudson
Reviewed-by: Johann Lombardi <johann.lombardi@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
28 files changed:
lustre/include/lustre/lustre_idl.h
lustre/include/lustre/lustre_user.h
lustre/include/lustre/lustreapi.h
lustre/include/lustre_req_layout.h
lustre/include/obd_support.h
lustre/llite/dir.c
lustre/llite/file.c
lustre/llite/llite_internal.h
lustre/llite/llite_nfs.c
lustre/mdc/lproc_mdc.c
lustre/mdc/mdc_request.c
lustre/mdt/mdt_handler.c
lustre/mdt/mdt_hsm.c
lustre/mdt/mdt_internal.h
lustre/mdt/mdt_mds.c
lustre/ptlrpc/layout.c
lustre/ptlrpc/lproc_ptlrpc.c
lustre/ptlrpc/pack_generic.c
lustre/ptlrpc/wiretest.c
lustre/tests/copytool.c
lustre/utils/LCOPYING [new file with mode: 0644]
lustre/utils/Makefile.am
lustre/utils/liblustreapi.c
lustre/utils/liblustreapi_hsm.c [new file with mode: 0644]
lustre/utils/lustreapi_internal.h [new file with mode: 0644]
lustre/utils/req-layout.c
lustre/utils/wirecheck.c
lustre/utils/wiretest.c

index 8dac1cc..b21b605 100644 (file)
@@ -1821,28 +1821,35 @@ typedef enum {
 
 /* opcodes */
 typedef enum {
-        MDS_GETATTR      = 33,
-        MDS_GETATTR_NAME = 34,
-        MDS_CLOSE        = 35,
-        MDS_REINT        = 36,
-        MDS_READPAGE     = 37,
-        MDS_CONNECT      = 38,
-        MDS_DISCONNECT   = 39,
-        MDS_GETSTATUS    = 40,
-        MDS_STATFS       = 41,
-        MDS_PIN          = 42,
-        MDS_UNPIN        = 43,
-        MDS_SYNC         = 44,
-        MDS_DONE_WRITING = 45,
-        MDS_SET_INFO     = 46,
-        MDS_QUOTACHECK   = 47,
-        MDS_QUOTACTL     = 48,
-        MDS_GETXATTR     = 49,
-        MDS_SETXATTR     = 50, /* obsolete, now it's MDS_REINT op */
-        MDS_WRITEPAGE    = 51,
-        MDS_IS_SUBDIR    = 52,
-        MDS_GET_INFO     = 53,
-        MDS_LAST_OPC
+       MDS_GETATTR             = 33,
+       MDS_GETATTR_NAME        = 34,
+       MDS_CLOSE               = 35,
+       MDS_REINT               = 36,
+       MDS_READPAGE            = 37,
+       MDS_CONNECT             = 38,
+       MDS_DISCONNECT          = 39,
+       MDS_GETSTATUS           = 40,
+       MDS_STATFS              = 41,
+       MDS_PIN                 = 42,
+       MDS_UNPIN               = 43,
+       MDS_SYNC                = 44,
+       MDS_DONE_WRITING        = 45,
+       MDS_SET_INFO            = 46,
+       MDS_QUOTACHECK          = 47,
+       MDS_QUOTACTL            = 48,
+       MDS_GETXATTR            = 49,
+       MDS_SETXATTR            = 50, /* obsolete, now it's MDS_REINT op */
+       MDS_WRITEPAGE           = 51,
+       MDS_IS_SUBDIR           = 52,
+       MDS_GET_INFO            = 53,
+       MDS_HSM_STATE_GET       = 54,
+       MDS_HSM_STATE_SET       = 55,
+       MDS_HSM_ACTION          = 56,
+       MDS_HSM_PROGRESS        = 57,
+       MDS_HSM_REQUEST         = 58,
+       MDS_HSM_CT_REGISTER     = 59,
+       MDS_HSM_CT_UNREGISTER   = 60,
+       MDS_LAST_OPC
 } mds_cmd_t;
 
 #define MDS_FIRST_OPC    MDS_GETATTR
@@ -3293,5 +3300,27 @@ struct layout_intent {
 
 void lustre_swab_layout_intent(struct layout_intent *li);
 
+/**
+ * On the wire version of hsm_progress structure.
+ *
+ * Contains the userspace hsm_progress and some internal fields.
+ */
+struct hsm_progress_kernel {
+       /* Field taken from struct hsm_progress */
+       lustre_fid              hpk_fid;
+       __u64                   hpk_cookie;
+       struct hsm_extent       hpk_extent;
+       __u16                   hpk_flags;
+       __u16                   hpk_errval; /* positive val */
+       __u32                   hpk_padding1;
+       /* Additional fields */
+       __u64                   hpk_data_version;
+       __u64                   hpk_padding2;
+} __attribute__((packed));
+
+extern void lustre_swab_hsm_user_state(struct hsm_user_state *hus);
+extern void lustre_swab_hsm_progress_kernel(struct hsm_progress_kernel *hpk);
+extern void lustre_swab_hsm_user_item(struct hsm_user_item *hui);
+
 #endif
 /** @} lustreidl */
index baa3373..09f11f6 100644 (file)
@@ -152,10 +152,17 @@ struct obd_statfs {
 #define LL_IOC_PATH2FID                 _IOR ('f', 173, long)
 #define LL_IOC_GET_CONNECT_FLAGS        _IOWR('f', 174, __u64 *)
 #define LL_IOC_GET_MDTIDX               _IOR ('f', 175, int)
-#define LL_IOC_HSM_CT_START             _IOW ('f', 176,struct lustre_kernelcomm)
+
 /* see <lustre_lib.h> for ioctl numbers 177-210 */
 
-#define LL_IOC_DATA_VERSION             _IOR ('f', 218, struct ioc_data_version)
+#define LL_IOC_HSM_STATE_GET           _IOR('f', 211, struct hsm_user_state)
+#define LL_IOC_HSM_STATE_SET           _IOW('f', 212, struct hsm_state_set)
+#define LL_IOC_HSM_CT_START            _IOW('f', 213, struct lustre_kernelcomm)
+#define LL_IOC_HSM_COPY_START          _IOW('f', 214, struct hsm_copy *)
+#define LL_IOC_HSM_COPY_END            _IOW('f', 215, struct hsm_copy *)
+#define LL_IOC_HSM_PROGRESS            _IOW('f', 216, struct hsm_user_request)
+#define LL_IOC_HSM_REQUEST             _IOW('f', 217, struct hsm_user_request)
+#define LL_IOC_DATA_VERSION            _IOR('f', 218, struct ioc_data_version)
 
 #define LL_STATFS_LMV           1
 #define LL_STATFS_LOV           2
@@ -891,13 +898,14 @@ static inline char *hsm_copytool_action2name(enum hsm_copytool_action  a)
 
 /* Copytool item action description */
 struct hsm_action_item {
-        __u32      hai_len;     /* valid size of this struct */
-        __u32      hai_action;  /* hsm_copytool_action, but use known size */
-        lustre_fid hai_fid;     /* Lustre FID to operated on */
-        struct hsm_extent hai_extent;  /* byte range to operate on */
-        __u64      hai_cookie;  /* action cookie from coordinator */
-        __u64      hai_gid;     /* grouplock id */
-        char       hai_data[0]; /* variable length */
+       __u32      hai_len;     /* valid size of this struct */
+       __u32      hai_action;  /* hsm_copytool_action, but use known size */
+       lustre_fid hai_fid;     /* Lustre FID to operated on */
+       lustre_fid hai_dfid;    /* fid used for data access */
+       struct hsm_extent hai_extent;  /* byte range to operate on */
+       __u64      hai_cookie;  /* action cookie from coordinator */
+       __u64      hai_gid;     /* grouplock id */
+       char       hai_data[0]; /* variable length */
 } __attribute__((packed));
 
 /*
@@ -932,16 +940,17 @@ static inline char *hai_dump_data_field(struct hsm_action_item *hai,
 
 /* Copytool action list */
 #define HAL_VERSION 1
-#define HAL_MAXSIZE 4096 /* bytes, used in userspace only */
+#define HAL_MAXSIZE LNET_MTU /* bytes, used in userspace only */
 struct hsm_action_list {
-        __u32 hal_version;
-        __u32 hal_count;       /* number of hai's to follow */
-        __u64 hal_compound_id; /* returned by coordinator */
-        __u32 hal_archive_num; /* which archive backend */
-        __u32 padding1;
-        char  hal_fsname[0];   /* null-terminated */
-        /* struct hsm_action_item[hal_count] follows, aligned on 8-byte
-           boundaries. See hai_zero */
+       __u32 hal_version;
+       __u32 hal_count;       /* number of hai's to follow */
+       __u64 hal_compound_id; /* returned by coordinator */
+       __u64 hal_flags;
+       __u32 hal_archive_num; /* which archive backend */
+       __u32 padding1;
+       char  hal_fsname[0];   /* null-terminated */
+       /* struct hsm_action_item[hal_count] follows, aligned on 8-byte
+          boundaries. See hai_zero */
 } __attribute__((packed));
 
 #ifndef HAVE_CFS_SIZE_ROUND
@@ -986,12 +995,27 @@ static inline int hal_size(struct hsm_action_list *hal)
 #define HP_FLAG_RETRY     0x02
 
 struct hsm_progress {
-        lustre_fid        hp_fid;
-        __u64             hp_cookie;
-        struct hsm_extent hp_extent;
-        __u16             hp_flags;
-        __u16             hp_errval; /* positive val */
-} __attribute__((packed));
+       lustre_fid              hp_fid;
+       __u64                   hp_cookie;
+       struct hsm_extent       hp_extent;
+       __u16                   hp_flags;
+       __u16                   hp_errval; /* positive val */
+       __u32                   padding;
+};
+
+/**
+ * Use by copytool during any hsm request they handled.
+ * This structure is initialized by llapi_hsm_copy_start()
+ * which is an helper over the ioctl() interface
+ * Store Lustre, internal use only, data.
+ */
+struct hsm_copy {
+       __u64                   hc_data_version;
+       __u16                   hc_flags;
+       __u16                   hc_errval; /* positive val */
+       __u32                   padding;
+       struct hsm_action_item  hc_hai;
+};
 
 /** @} lustreuser */
 
index b53e7d5..4bb4691 100644 (file)
@@ -208,6 +208,8 @@ extern int llapi_getname(const char *path, char *buf, size_t size);
 extern void llapi_ping_target(char *obd_type, char *obd_name,
                               char *obd_uuid, void *args);
 
+extern int llapi_search_rootpath(char *pathname, const char *fsname);
+
 struct mntent;
 #define HAVE_LLAPI_IS_LUSTRE_MNT
 extern int llapi_is_lustre_mnt(struct mntent *mnt);
@@ -260,14 +262,27 @@ extern int llapi_changelog_free(struct changelog_ext_rec **rech);
 extern int llapi_changelog_clear(const char *mdtname, const char *idstr,
                                  long long endrec);
 
-/* HSM copytool interface.  priv is private state, managed internally
-   by these functions */
-extern int llapi_copytool_start(void **priv, char *fsname, int flags,
-                                int archive_count, int *archives);
-extern int llapi_copytool_fini(void **priv);
-extern int llapi_copytool_recv(void *priv, struct hsm_action_list **hal,
-                               int *msgsize);
-extern int llapi_copytool_free(struct hsm_action_list **hal);
+/* HSM copytool interface.
+ * priv is private state, managed internally by these functions
+ */
+extern int llapi_hsm_copytool_start(void **priv, char *fsname, int flags,
+                                   int archive_count, int *archives);
+extern int llapi_hsm_copytool_fini(void **priv);
+extern int llapi_hsm_copytool_recv(void *priv, struct hsm_action_list **hal,
+                                  int *msgsize);
+extern int llapi_hsm_copytool_free(struct hsm_action_list **hal);
+extern int llapi_hsm_copy_start(char *mnt, struct hsm_copy *copy,
+                               const struct hsm_action_item *hai);
+extern int llapi_hsm_copy_end(char *mnt, struct hsm_copy *copy,
+                             const struct hsm_progress *hp);
+extern int llapi_hsm_request(char *mnt, struct hsm_user_request *request);
+extern int llapi_hsm_progress(char *mnt, struct hsm_progress *hp);
+extern struct hsm_user_request *llapi_hsm_user_request_alloc(int itemcount,
+                                                            int data_len);
+extern int llapi_hsm_import(const char *dst, int archive, struct stat *st,
+                           unsigned long long stripe_size, int stripe_offset,
+                           int stripe_count, int stripe_pattern,
+                           char *pool_name, lustre_fid *newfid);
 
 /** @} llapi */
 
index 69c299f..bcc4849 100644 (file)
@@ -186,6 +186,12 @@ extern struct req_format RQF_MDS_QUOTACHECK;
 extern struct req_format RQF_MDS_QUOTACTL;
 extern struct req_format RQF_QC_CALLBACK;
 extern struct req_format RQF_QUOTA_DQACQ;
+/* MDS hsm formats */
+extern struct req_format RQF_MDS_HSM_STATE_GET;
+extern struct req_format RQF_MDS_HSM_STATE_SET;
+extern struct req_format RQF_MDS_HSM_PROGRESS;
+extern struct req_format RQF_MDS_HSM_CT_REGISTER;
+extern struct req_format RQF_MDS_HSM_CT_UNREGISTER;
 /* OST req_format */
 extern struct req_format RQF_OST_CONNECT;
 extern struct req_format RQF_OST_DISCONNECT;
@@ -272,6 +278,10 @@ extern struct req_msg_field RMF_OBD_QUOTACHECK;
 extern struct req_msg_field RMF_OBD_QUOTACTL;
 extern struct req_msg_field RMF_QUOTA_BODY;
 extern struct req_msg_field RMF_STRING;
+extern struct req_msg_field RMF_MDS_HSM_PROGRESS;
+extern struct req_msg_field RMF_MDS_HSM_REQUEST;
+extern struct req_msg_field RMF_MDS_HSM_USER_ITEM;
+extern struct req_msg_field RMF_MDS_HSM_ARCHIVE;
 
 /* seq-mgr fields */
 extern struct req_msg_field RMF_SEQ_OPC;
index c99152d..e59a41b 100644 (file)
@@ -233,6 +233,12 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_MDS_PDO_LOCK2           0x146
 #define OBD_FAIL_MDS_OSC_CREATE_FAIL     0x147
 #define OBD_FAIL_MDS_NEGATIVE_POSITIVE  0x148
+#define OBD_FAIL_MDS_HSM_STATE_GET_NET         0x149
+#define OBD_FAIL_MDS_HSM_STATE_SET_NET         0x14a
+#define OBD_FAIL_MDS_HSM_PROGRESS_NET          0x14b
+#define OBD_FAIL_MDS_HSM_REQUEST_NET           0x14c
+#define OBD_FAIL_MDS_HSM_CT_REGISTER_NET       0x14d
+#define OBD_FAIL_MDS_HSM_CT_UNREGISTER_NET     0x14e
 
 /* layout lock */
 #define OBD_FAIL_MDS_NO_LL_GETATTR      0x170
index 590ce5f..1fef702 100644 (file)
@@ -860,6 +860,176 @@ int ll_get_mdt_idx(struct inode *inode)
         return mdtidx;
 }
 
+/**
+ * Generic handler to do any pre-copy work.
+ *
+ * It send a first hsm_progress (with extent length == 0) to coordinator as a
+ * first information for it that real work has started.
+ *
+ * Moreover, for a ARCHIVE request, it will sample the file data version and
+ * store it in \a copy.
+ *
+ * \return 0 on success.
+ */
+static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
+{
+       struct ll_sb_info               *sbi = ll_s2sbi(sb);
+       struct hsm_progress_kernel       hpk;
+       int                              rc;
+       ENTRY;
+
+       /* Forge a hsm_progress based on data from copy. */
+       hpk.hpk_fid = copy->hc_hai.hai_fid;
+       hpk.hpk_cookie = copy->hc_hai.hai_cookie;
+       hpk.hpk_extent.offset = copy->hc_hai.hai_extent.offset;
+       hpk.hpk_extent.length = 0;
+       hpk.hpk_flags = 0;
+       hpk.hpk_errval = 0;
+       hpk.hpk_data_version = 0;
+
+
+       /* For archive request, we need to read the current file version. */
+       if (copy->hc_hai.hai_action == HSMA_ARCHIVE) {
+               struct inode    *inode;
+               __u64            data_version = 0;
+
+               /* Get inode for this fid */
+               inode = search_inode_for_lustre(sb, &copy->hc_hai.hai_fid);
+               if (IS_ERR(inode)) {
+                       hpk.hpk_flags |= HP_FLAG_RETRY;
+                       /* hpk_errval is >= 0 */
+                       hpk.hpk_errval = -PTR_ERR(inode);
+                       GOTO(progress, rc = PTR_ERR(inode));
+               }
+
+               /* Read current file data version */
+               rc = ll_data_version(inode, &data_version, 1);
+               iput(inode);
+               if (rc != 0) {
+                       CDEBUG(D_HSM, "Could not read file data version of "
+                                     DFID" (rc = %d). Archive request ("
+                                     LPX64") could not be done.\n",
+                                     PFID(&copy->hc_hai.hai_fid), rc,
+                                     copy->hc_hai.hai_cookie);
+                       hpk.hpk_flags |= HP_FLAG_RETRY;
+                       /* hpk_errval must be >= 0 */
+                       hpk.hpk_errval = -rc;
+                       GOTO(progress, rc);
+               }
+
+               /* Store it the hsm_copy for later copytool use.
+                * Always modified even if no lsm. */
+               copy->hc_data_version = data_version;
+       }
+
+progress:
+       rc = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
+                          &hpk, NULL);
+
+       RETURN(rc);
+}
+
+/**
+ * Generic handler to do any post-copy work.
+ *
+ * It will send the last hsm_progress update to coordinator to inform it
+ * that copy is finished and whether it was successful or not.
+ *
+ * Moreover,
+ * - for ARCHIVE request, it will sample the file data version and compare it
+ *   with the version saved in ll_ioc_copy_start(). If they do not match, copy
+ *   will be considered as failed.
+ * - for RESTORE request, it will sample the file data version and send it to
+ *   coordinator which is useful if the file was imported as 'released'.
+ *
+ * \return 0 on success.
+ */
+static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
+{
+       struct ll_sb_info               *sbi = ll_s2sbi(sb);
+       struct hsm_progress_kernel       hpk;
+       int                              rc;
+       ENTRY;
+
+       /* If you modify the logic here, also check llapi_hsm_copy_end(). */
+       /* Take care: copy->hc_hai.hai_action, len, gid and data are not
+        * initialized if copy_end was called with copy == NULL.
+        */
+
+       /* Forge a hsm_progress based on data from copy. */
+       hpk.hpk_fid = copy->hc_hai.hai_fid;
+       hpk.hpk_cookie = copy->hc_hai.hai_cookie;
+       hpk.hpk_extent = copy->hc_hai.hai_extent;
+       hpk.hpk_flags = copy->hc_flags | HP_FLAG_COMPLETED;
+       hpk.hpk_errval = copy->hc_errval;
+       hpk.hpk_data_version = 0;
+
+       /* For archive request, we need to check the file data was not changed.
+        *
+        * For restore request, we need to send the file data version, this is
+        * useful when the file was created using hsm_import.
+        */
+       if (((copy->hc_hai.hai_action == HSMA_ARCHIVE) ||
+            (copy->hc_hai.hai_action == HSMA_RESTORE)) &&
+           (copy->hc_errval == 0)) {
+               struct inode    *inode;
+               __u64            data_version = 0;
+
+               /* Get lsm for this fid */
+               inode = search_inode_for_lustre(sb, &copy->hc_hai.hai_fid);
+               if (IS_ERR(inode)) {
+                       hpk.hpk_flags |= HP_FLAG_RETRY;
+                       /* hpk_errval must be >= 0 */
+                       hpk.hpk_errval = -PTR_ERR(inode);
+                       GOTO(progress, rc = PTR_ERR(inode));
+               }
+
+               rc = ll_data_version(inode, &data_version,
+                                    copy->hc_hai.hai_action == HSMA_ARCHIVE);
+               iput(inode);
+               if (rc) {
+                       CDEBUG(D_HSM, "Could not read file data version. "
+                                     "Request could not be confirmed.\n");
+                       if (hpk.hpk_errval == 0)
+                               hpk.hpk_errval = rc;
+                       GOTO(progress, rc);
+               }
+
+               /* Store it the hsm_copy for later copytool use.
+                * Always modified even if no lsm. */
+               hpk.hpk_data_version = data_version;
+
+               /* File could have been stripped during archiving, so we need
+                * to check anyway. */
+               if ((copy->hc_hai.hai_action == HSMA_ARCHIVE) &&
+                   (copy->hc_data_version != data_version)) {
+                       CDEBUG(D_HSM, "File data version mismatched. "
+                             "File content was changed during archiving. "
+                              DFID", start:"LPX64" current:"LPX64"\n",
+                              PFID(&copy->hc_hai.hai_fid),
+                              copy->hc_data_version, data_version);
+                       /* File was changed, send error to cdt. Do not ask for
+                        * retry because if a file is modified frequently,
+                        * the cdt will loop on retried archive requests.
+                        * The policy engine will ask for a new archive later
+                        * when the file will not be modified for some tunable
+                        * time */
+                       /* we do not notify caller */
+                       hpk.hpk_flags &= ~HP_FLAG_RETRY;
+                       /* hpk_errval must be >= 0 */
+                       hpk.hpk_errval = EBUSY;
+               }
+
+       }
+
+progress:
+       rc = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
+                          &hpk, NULL);
+
+       RETURN(rc);
+}
+
+
 static int copy_and_ioctl(int cmd, struct obd_export *exp, void *data, int len)
 {
         void *ptr;
@@ -1460,14 +1630,74 @@ out_free:
                 RETURN(rc);
         case OBD_IOC_FID2PATH:
                RETURN(ll_fid2path(inode, (void *)arg));
-        case LL_IOC_HSM_CT_START:
-                rc = copy_and_ioctl(cmd, sbi->ll_md_exp, (void *)arg,
-                                    sizeof(struct lustre_kernelcomm));
-                RETURN(rc);
+       case LL_IOC_HSM_PROGRESS: {
+               struct hsm_progress_kernel      hpk;
+               struct hsm_progress             hp;
+
+               if (cfs_copy_from_user(&hp, (void *)arg, sizeof(hp)))
+                       RETURN(-EFAULT);
+
+               hpk.hpk_fid = hp.hp_fid;
+               hpk.hpk_cookie = hp.hp_cookie;
+               hpk.hpk_extent = hp.hp_extent;
+               hpk.hpk_flags = hp.hp_flags;
+               hpk.hpk_errval = hp.hp_errval;
+               hpk.hpk_data_version = 0;
+
+               /* File may not exist in Lustre; all progress
+                * reported to Lustre root */
+               rc = obd_iocontrol(cmd, sbi->ll_md_exp, sizeof(hpk), &hpk,
+                                  NULL);
+               RETURN(rc);
+       }
+       case LL_IOC_HSM_CT_START:
+               rc = copy_and_ioctl(cmd, sbi->ll_md_exp, (void *)arg,
+                                   sizeof(struct lustre_kernelcomm));
+               RETURN(rc);
+
+       case LL_IOC_HSM_COPY_START: {
+               struct hsm_copy *copy;
+               int              rc;
+
+               OBD_ALLOC_PTR(copy);
+               if (copy == NULL)
+                       RETURN(-ENOMEM);
+               if (cfs_copy_from_user(copy, (char *)arg, sizeof(*copy))) {
+                       OBD_FREE_PTR(copy);
+                       RETURN(-EFAULT);
+               }
+
+               rc = ll_ioc_copy_start(inode->i_sb, copy);
+               if (cfs_copy_to_user((char *)arg, copy, sizeof(*copy)))
+                       rc = -EFAULT;
+
+               OBD_FREE_PTR(copy);
+               RETURN(rc);
+       }
+       case LL_IOC_HSM_COPY_END: {
+               struct hsm_copy *copy;
+               int              rc;
+
+               OBD_ALLOC_PTR(copy);
+               if (copy == NULL)
+                       RETURN(-ENOMEM);
+               if (cfs_copy_from_user(copy, (char *)arg, sizeof(*copy))) {
+                       OBD_FREE_PTR(copy);
+                       RETURN(-EFAULT);
+               }
+
+               rc = ll_ioc_copy_end(inode->i_sb, copy);
+               if (cfs_copy_to_user((char *)arg, copy, sizeof(*copy)))
+                       rc = -EFAULT;
+
+               OBD_FREE_PTR(copy);
+               RETURN(rc);
+       }
 
-        default:
-                RETURN(obd_iocontrol(cmd, sbi->ll_dt_exp,0,NULL,(void *)arg));
-        }
+       default:
+               RETURN(obd_iocontrol(cmd, sbi->ll_dt_exp, 0, NULL,
+                                    (void *)arg));
+       }
 }
 
 static loff_t ll_dir_seek(struct file *file, loff_t offset, int origin)
index 31a5cd4..39a9edd 100644 (file)
@@ -1795,40 +1795,40 @@ error:
  * Version is computed using server side locking.
  *
  * @param extent_lock  Take extent lock. Not needed if a process is already
- *                     holding the OST object group locks.
+ *                    holding the OST object group locks.
  */
-static int ll_data_version(struct inode *inode, __u64 *data_version,
-                           int extent_lock)
+int ll_data_version(struct inode *inode, __u64 *data_version,
+                   int extent_lock)
 {
-       struct lov_stripe_md *lsm = NULL;
-       struct ll_sb_info    *sbi = ll_i2sbi(inode);
-       struct obdo          *obdo = NULL;
-       int                   rc;
+       struct lov_stripe_md    *lsm = NULL;
+       struct ll_sb_info       *sbi = ll_i2sbi(inode);
+       struct obdo             *obdo = NULL;
+       int                      rc;
        ENTRY;
 
        /* If no stripe, we consider version is 0. */
        lsm = ccc_inode_lsm_get(inode);
        if (lsm == NULL) {
-                *data_version = 0;
-                CDEBUG(D_INODE, "No object for inode\n");
-                RETURN(0);
-        }
+               *data_version = 0;
+               CDEBUG(D_INODE, "No object for inode\n");
+               RETURN(0);
+       }
 
-        OBD_ALLOC_PTR(obdo);
+       OBD_ALLOC_PTR(obdo);
        if (obdo == NULL) {
                ccc_inode_lsm_put(inode, lsm);
                RETURN(-ENOMEM);
        }
 
-        rc = ll_lsm_getattr(lsm, sbi->ll_dt_exp, NULL, obdo, 0, extent_lock);
-        if (!rc) {
-                if (!(obdo->o_valid & OBD_MD_FLDATAVERSION))
-                        rc = -EOPNOTSUPP;
-                else
-                        *data_version = obdo->o_data_version;
-        }
+       rc = ll_lsm_getattr(lsm, sbi->ll_dt_exp, NULL, obdo, 0, extent_lock);
+       if (!rc) {
+               if (!(obdo->o_valid & OBD_MD_FLDATAVERSION))
+                       rc = -EOPNOTSUPP;
+               else
+                       *data_version = obdo->o_data_version;
+       }
 
-        OBD_FREE_PTR(obdo);
+       OBD_FREE_PTR(obdo);
        ccc_inode_lsm_put(inode, lsm);
 
        RETURN(rc);
index 2e925f6..cc03923 100644 (file)
@@ -784,6 +784,7 @@ int ll_merge_lvb(struct inode *inode);
 int ll_get_grouplock(struct inode *inode, struct file *file, unsigned long arg);
 int ll_put_grouplock(struct inode *inode, struct file *file, unsigned long arg);
 int ll_fid2path(struct inode *inode, void *arg);
+int ll_data_version(struct inode *inode, __u64 *data_version, int extent_lock);
 
 /* llite/dcache.c */
 
@@ -855,6 +856,8 @@ char *ll_get_fsname(struct super_block *sb, char *buf, int buflen);
 /* llite/llite_nfs.c */
 extern struct export_operations lustre_export_operations;
 __u32 get_uuid2int(const char *name, int len);
+struct inode *search_inode_for_lustre(struct super_block *sb,
+                                     const struct lu_fid *fid);
 
 /* llite/special.c */
 extern struct inode_operations ll_special_inode_operations;
index eeb24a5..0bf7265 100644 (file)
@@ -66,8 +66,8 @@ static int ll_nfs_test_inode(struct inode *inode, void *opaque)
                          (struct lu_fid *)opaque);
 }
 
-static struct inode *search_inode_for_lustre(struct super_block *sb,
-                                             const struct lu_fid *fid)
+struct inode *search_inode_for_lustre(struct super_block *sb,
+                                     const struct lu_fid *fid)
 {
         struct ll_sb_info     *sbi = ll_s2sbi(sb);
         struct ptlrpc_request *req = NULL;
index e40afc1..509fd59 100644 (file)
@@ -78,61 +78,63 @@ static int mdc_wr_max_rpcs_in_flight(struct file *file, const char *buffer,
 
 /* temporary for testing */
 static int mdc_wr_kuc(struct file *file, const char *buffer,
-                      unsigned long count, void *data)
+                     unsigned long count, void *data)
 {
-        struct obd_device *obd = data;
-        struct kuc_hdr *lh;
-        struct hsm_action_list *hal;
-        struct hsm_action_item *hai;
-        int len;
-        int fd, rc;
-
-        rc = lprocfs_write_helper(buffer, count, &fd);
-        if (rc)
-                return rc;
-
-        if (fd < 0)
-                return -ERANGE;
-        CWARN("message to fd %d\n", fd);
-
-        len = sizeof(*lh) + sizeof(*hal) + MTI_NAME_MAXLEN +
-                /* for mockup below */ 2 * cfs_size_round(sizeof(*hai));
-
-        OBD_ALLOC(lh, len);
-
-        lh->kuc_magic = KUC_MAGIC;
-        lh->kuc_transport = KUC_TRANSPORT_HSM;
-        lh->kuc_msgtype = HMT_ACTION_LIST;
-        lh->kuc_msglen = len;
-
-        hal = (struct hsm_action_list *)(lh + 1);
-        hal->hal_version = HAL_VERSION;
-        hal->hal_archive_num = 1;
-        obd_uuid2fsname(hal->hal_fsname, obd->obd_name, MTI_NAME_MAXLEN);
-
-        /* mock up an action list */
-        hal->hal_count = 2;
-        hai = hai_zero(hal);
-        hai->hai_action = HSMA_ARCHIVE;
-        hai->hai_fid.f_oid = 5;
-        hai->hai_len = sizeof(*hai);
-        hai = hai_next(hai);
-        hai->hai_action = HSMA_RESTORE;
-        hai->hai_fid.f_oid = 10;
-        hai->hai_len = sizeof(*hai);
-
-        /* This works for either broadcast or unicast to a single fd */
-        if (fd == 0) {
-                rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh);
-        } else {
-                cfs_file_t *fp = cfs_get_fd(fd);
-                rc = libcfs_kkuc_msg_put(fp, lh);
-                cfs_put_file(fp);
-        }
-        OBD_FREE(lh, len);
-        if (rc < 0)
-                return rc;
-        return count;
+       struct obd_device       *obd = data;
+       struct kuc_hdr          *lh;
+       struct hsm_action_list  *hal;
+       struct hsm_action_item  *hai;
+       int                      len;
+       int                      fd, rc;
+       ENTRY;
+
+       rc = lprocfs_write_helper(buffer, count, &fd);
+       if (rc)
+               RETURN(rc);
+
+       if (fd < 0)
+               RETURN(-ERANGE);
+       CWARN("message to fd %d\n", fd);
+
+       len = sizeof(*lh) + sizeof(*hal) + MTI_NAME_MAXLEN +
+               /* for mockup below */ 2 * cfs_size_round(sizeof(*hai));
+
+       OBD_ALLOC(lh, len);
+
+       lh->kuc_magic = KUC_MAGIC;
+       lh->kuc_transport = KUC_TRANSPORT_HSM;
+       lh->kuc_msgtype = HMT_ACTION_LIST;
+       lh->kuc_msglen = len;
+
+       hal = (struct hsm_action_list *)(lh + 1);
+       hal->hal_version = HAL_VERSION;
+       hal->hal_archive_num = 1;
+       hal->hal_flags = 0;
+       obd_uuid2fsname(hal->hal_fsname, obd->obd_name, MTI_NAME_MAXLEN);
+
+       /* mock up an action list */
+       hal->hal_count = 2;
+       hai = hai_zero(hal);
+       hai->hai_action = HSMA_ARCHIVE;
+       hai->hai_fid.f_oid = 5;
+       hai->hai_len = sizeof(*hai);
+       hai = hai_next(hai);
+       hai->hai_action = HSMA_RESTORE;
+       hai->hai_fid.f_oid = 10;
+       hai->hai_len = sizeof(*hai);
+
+       /* This works for either broadcast or unicast to a single fd */
+       if (fd == 0) {
+               rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh);
+       } else {
+               cfs_file_t *fp = cfs_get_fd(fd);
+               rc = libcfs_kkuc_msg_put(fp, lh);
+               cfs_put_file(fp);
+       }
+       OBD_FREE(lh, len);
+       if (rc < 0)
+               RETURN(rc);
+       RETURN(count);
 }
 
 static struct lprocfs_vars lprocfs_mdc_obd_vars[] = {
index 54a8434..a76f279 100644 (file)
@@ -1197,6 +1197,83 @@ out:
         return rc;
 }
 
+static int mdc_ioc_hsm_progress(struct obd_export *exp,
+                               struct hsm_progress_kernel *hpk)
+{
+       struct obd_import               *imp = class_exp2cliimp(exp);
+       struct hsm_progress_kernel      *req_hpk;
+       struct ptlrpc_request           *req;
+       int                              rc;
+       ENTRY;
+
+       req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_HSM_PROGRESS,
+                                       LUSTRE_MDS_VERSION, MDS_HSM_PROGRESS);
+       if (req == NULL)
+               GOTO(out, rc = -ENOMEM);
+
+       /* Copy hsm_progress struct */
+       req_hpk = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_PROGRESS);
+       LASSERT(req_hpk);
+       *req_hpk = *hpk;
+
+       ptlrpc_request_set_replen(req);
+
+       rc = ptlrpc_queue_wait(req);
+       GOTO(out, rc);
+out:
+       ptlrpc_req_finished(req);
+       return rc;
+}
+
+static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)
+{
+       __u32                   *archive_mask;
+       struct ptlrpc_request   *req;
+       int                      rc;
+       ENTRY;
+
+       req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_HSM_CT_REGISTER,
+                                       LUSTRE_MDS_VERSION,
+                                       MDS_HSM_CT_REGISTER);
+       if (req == NULL)
+               GOTO(out, rc = -ENOMEM);
+
+       /* Copy hsm_progress struct */
+       archive_mask = req_capsule_client_get(&req->rq_pill,
+                                             &RMF_MDS_HSM_ARCHIVE);
+       LASSERT(archive_mask);
+       *archive_mask = archives;
+
+       ptlrpc_request_set_replen(req);
+
+       rc = ptlrpc_queue_wait(req);
+       GOTO(out, rc);
+out:
+       ptlrpc_req_finished(req);
+       return rc;
+}
+
+static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp)
+{
+       struct ptlrpc_request   *req;
+       int                      rc;
+       ENTRY;
+
+       req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_HSM_CT_UNREGISTER,
+                                       LUSTRE_MDS_VERSION,
+                                       MDS_HSM_CT_UNREGISTER);
+       if (req == NULL)
+               GOTO(out, rc = -ENOMEM);
+
+       ptlrpc_request_set_replen(req);
+
+       rc = ptlrpc_queue_wait(req);
+       GOTO(out, rc);
+out:
+       ptlrpc_req_finished(req);
+       return rc;
+}
+
 static struct kuc_hdr *changelog_kuc_hdr(char *buf, int len, int flags)
 {
         struct kuc_hdr *lh = (struct kuc_hdr *)buf;
@@ -1457,9 +1534,6 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 return -EINVAL;
         }
         switch (cmd) {
-        case LL_IOC_HSM_CT_START:
-                rc = mdc_ioc_hsm_ct_start(exp, karg);
-                GOTO(out, rc);
         case OBD_IOC_CHANGELOG_SEND:
                 rc = mdc_ioc_changelog_send(obd, karg);
                 GOTO(out, rc);
@@ -1472,10 +1546,15 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                                         NULL);
                 GOTO(out, rc);
         }
-        case OBD_IOC_FID2PATH: {
-                rc = mdc_ioc_fid2path(exp, karg);
-                GOTO(out, rc);
-        }
+       case OBD_IOC_FID2PATH:
+               rc = mdc_ioc_fid2path(exp, karg);
+               GOTO(out, rc);
+       case LL_IOC_HSM_CT_START:
+               rc = mdc_ioc_hsm_ct_start(exp, karg);
+               GOTO(out, rc);
+       case LL_IOC_HSM_PROGRESS:
+               rc = mdc_ioc_hsm_progress(exp, karg);
+               GOTO(out, rc);
         case OBD_IOC_CLIENT_RECOVER:
                 rc = ptlrpc_recover_import(imp, data->ioc_inlbuf1, 0);
                 if (rc < 0)
@@ -1624,28 +1703,30 @@ int mdc_get_info_rpc(struct obd_export *exp,
 
 static void lustre_swab_hai(struct hsm_action_item *h)
 {
-        __swab32s(&h->hai_len);
-        __swab32s(&h->hai_action);
-        lustre_swab_lu_fid(&h->hai_fid);
-        __swab64s(&h->hai_cookie);
-        __swab64s(&h->hai_extent.offset);
-        __swab64s(&h->hai_extent.length);
-        __swab64s(&h->hai_gid);
+       __swab32s(&h->hai_len);
+       __swab32s(&h->hai_action);
+       lustre_swab_lu_fid(&h->hai_fid);
+       lustre_swab_lu_fid(&h->hai_dfid);
+       __swab64s(&h->hai_cookie);
+       __swab64s(&h->hai_extent.offset);
+       __swab64s(&h->hai_extent.length);
+       __swab64s(&h->hai_gid);
 }
 
 static void lustre_swab_hal(struct hsm_action_list *h)
 {
-        struct hsm_action_item *hai;
-        int i;
-
-        __swab32s(&h->hal_version);
-        __swab32s(&h->hal_count);
-        __swab32s(&h->hal_archive_num);
-        hai = hai_zero(h);
-        for (i = 0; i < h->hal_count; i++) {
-                lustre_swab_hai(hai);
-                hai = hai_next(hai);
-        }
+       struct hsm_action_item  *hai;
+       int                      i;
+
+       __swab32s(&h->hal_version);
+       __swab32s(&h->hal_count);
+       __swab32s(&h->hal_archive_num);
+       __swab64s(&h->hal_flags);
+       hai = hai_zero(h);
+       for (i = 0; i < h->hal_count; i++) {
+               lustre_swab_hai(hai);
+               hai = hai_next(hai);
+       }
 }
 
 static void lustre_swab_kuch(struct kuc_hdr *l)
@@ -1657,33 +1738,36 @@ static void lustre_swab_kuch(struct kuc_hdr *l)
 }
 
 static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
-                                struct lustre_kernelcomm *lk)
+                               struct lustre_kernelcomm *lk)
 {
-        int rc = 0;
+       struct obd_import  *imp = class_exp2cliimp(exp);
+       __u32               archive = lk->lk_data;
+       int                 rc = 0;
 
-        if (lk->lk_group != KUC_GRP_HSM) {
-                CERROR("Bad copytool group %d\n", lk->lk_group);
-                return -EINVAL;
-        }
-
-        CDEBUG(D_HSM, "CT start r%d w%d u%d g%d f%#x\n", lk->lk_rfd, lk->lk_wfd,
-               lk->lk_uid, lk->lk_group, lk->lk_flags);
-
-        if (lk->lk_flags & LK_FLG_STOP)
-                rc = libcfs_kkuc_group_rem(lk->lk_uid,lk->lk_group);
-        else {
-                cfs_file_t *fp = cfs_get_fd(lk->lk_wfd);
-                rc = libcfs_kkuc_group_add(fp, lk->lk_uid,lk->lk_group,
-                                           lk->lk_data);
-                if (rc && fp)
-                        cfs_put_file(fp);
-        }
+       if (lk->lk_group != KUC_GRP_HSM) {
+               CERROR("Bad copytool group %d\n", lk->lk_group);
+               return -EINVAL;
+       }
 
-        /* lk_data is archive number mask */
-        /* TODO: register archive num with mdt so coordinator can choose
-           correct agent. */
+       CDEBUG(D_HSM, "CT start r%d w%d u%d g%d f%#x\n", lk->lk_rfd, lk->lk_wfd,
+              lk->lk_uid, lk->lk_group, lk->lk_flags);
+
+       if (lk->lk_flags & LK_FLG_STOP) {
+               rc = libcfs_kkuc_group_rem(lk->lk_uid, lk->lk_group);
+               /* Unregister with the coordinator */
+               if (rc == 0)
+                       rc = mdc_ioc_hsm_ct_unregister(imp);
+       } else {
+               cfs_file_t *fp = cfs_get_fd(lk->lk_wfd);
+               rc = libcfs_kkuc_group_add(fp, lk->lk_uid, lk->lk_group,
+                                          lk->lk_data);
+               if (rc && fp)
+                       cfs_put_file(fp);
+               if (rc == 0)
+                       rc = mdc_ioc_hsm_ct_register(imp, archive);
+       }
 
-        return rc;
+       return rc;
 }
 
 /**
@@ -1693,47 +1777,79 @@ static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
  */
 static int mdc_hsm_copytool_send(int len, void *val)
 {
-        struct kuc_hdr *lh = (struct kuc_hdr *)val;
-        struct hsm_action_list *hal = (struct hsm_action_list *)(lh + 1);
-        int rc;
-        ENTRY;
+       struct kuc_hdr          *lh = (struct kuc_hdr *)val;
+       struct hsm_action_list  *hal = (struct hsm_action_list *)(lh + 1);
+       int                      rc;
+       ENTRY;
 
-        if (len < sizeof(*lh) + sizeof(*hal)) {
-                CERROR("Short HSM message %d < %d\n", len,
-                      (int) (sizeof(*lh) + sizeof(*hal)));
-                RETURN(-EPROTO);
-        }
-        if (lh->kuc_magic == __swab16(KUC_MAGIC)) {
-                lustre_swab_kuch(lh);
-                lustre_swab_hal(hal);
-        } else if (lh->kuc_magic != KUC_MAGIC) {
-                CERROR("Bad magic %x!=%x\n", lh->kuc_magic, KUC_MAGIC);
-                RETURN(-EPROTO);
-        }
+       if (len < sizeof(*lh) + sizeof(*hal)) {
+               CERROR("Short HSM message %d < %d\n", len,
+                      (int) (sizeof(*lh) + sizeof(*hal)));
+               RETURN(-EPROTO);
+       }
+       if (lh->kuc_magic == __swab16(KUC_MAGIC)) {
+               lustre_swab_kuch(lh);
+               lustre_swab_hal(hal);
+       } else if (lh->kuc_magic != KUC_MAGIC) {
+               CERROR("Bad magic %x!=%x\n", lh->kuc_magic, KUC_MAGIC);
+               RETURN(-EPROTO);
+       }
 
-        CDEBUG(D_HSM, " Received message mg=%x t=%d m=%d l=%d actions=%d\n",
-               lh->kuc_magic, lh->kuc_transport, lh->kuc_msgtype,
-               lh->kuc_msglen, hal->hal_count);
+       CDEBUG(D_HSM, " Received message mg=%x t=%d m=%d l=%d actions=%d "
+              "on %s\n",
+              lh->kuc_magic, lh->kuc_transport, lh->kuc_msgtype,
+              lh->kuc_msglen, hal->hal_count, hal->hal_fsname);
 
-        /* Broadcast to HSM listeners */
-        rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh);
+       /* Broadcast to HSM listeners */
+       rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh);
 
-        RETURN(rc);
+       RETURN(rc);
+}
+
+/**
+ * callback function passed to kuc for re-registering each HSM copytool
+ * running on MDC, after MDT shutdown/recovery.
+ * @param data archive id served by the copytool
+ * @param cb_arg callback argument (obd_import)
+ */
+static int mdc_hsm_ct_reregister(__u32 data, void *cb_arg)
+{
+       struct obd_import       *imp = (struct obd_import *)cb_arg;
+       __u32                    archive = data;
+       int                      rc;
+
+       CDEBUG(D_HA, "recover copytool registration to MDT (archive=%#x)\n",
+              archive);
+       rc = mdc_ioc_hsm_ct_register(imp, archive);
+
+       /* ignore error if the copytool is already registered */
+       return ((rc != 0) && (rc != -EEXIST)) ? rc : 0;
+}
+
+/**
+ * Re-establish all kuc contexts with MDT
+ * after MDT shutdown/recovery.
+ */
+static int mdc_kuc_reregister(struct obd_import *imp)
+{
+       /* re-register HSM agents */
+       return libcfs_kkuc_group_foreach(KUC_GRP_HSM, mdc_hsm_ct_reregister,
+                                        (void *)imp);
 }
 
 int mdc_set_info_async(const struct lu_env *env,
-                       struct obd_export *exp,
-                       obd_count keylen, void *key,
-                       obd_count vallen, void *val,
-                       struct ptlrpc_request_set *set)
+                      struct obd_export *exp,
+                      obd_count keylen, void *key,
+                      obd_count vallen, void *val,
+                      struct ptlrpc_request_set *set)
 {
-        struct obd_import *imp = class_exp2cliimp(exp);
-        int                rc = -EINVAL;
-        ENTRY;
+       struct obd_import       *imp = class_exp2cliimp(exp);
+       int                      rc;
+       ENTRY;
 
-        if (KEY_IS(KEY_READ_ONLY)) {
-                if (vallen != sizeof(int))
-                        RETURN(-EINVAL);
+       if (KEY_IS(KEY_READ_ONLY)) {
+               if (vallen != sizeof(int))
+                       RETURN(-EINVAL);
 
                spin_lock(&imp->imp_lock);
                if (*((int *)val)) {
@@ -1778,7 +1894,8 @@ int mdc_set_info_async(const struct lu_env *env,
                 RETURN(rc);
         }
 
-        RETURN(rc);
+       CERROR("Unknown key %s\n", (char *)key);
+       RETURN(-EINVAL);
 }
 
 int mdc_get_info(const struct lu_env *env, struct obd_export *exp,
@@ -1970,10 +2087,12 @@ static int mdc_import_event(struct obd_device *obd, struct obd_import *imp,
 
                 break;
         }
-        case IMP_EVENT_ACTIVE: {
-                rc = obd_notify_observer(obd, obd, OBD_NOTIFY_ACTIVE, NULL);
-                break;
-        }
+       case IMP_EVENT_ACTIVE:
+               rc = obd_notify_observer(obd, obd, OBD_NOTIFY_ACTIVE, NULL);
+               /* restore re-establish kuc registration after reconnecting */
+               if (rc == 0)
+                       rc = mdc_kuc_reregister(imp);
+               break;
         case IMP_EVENT_OCD:
                 rc = obd_notify_observer(obd, obd, OBD_NOTIFY_OCD, NULL);
                 break;
index 7d5f6cb..8132a6a 100644 (file)
@@ -3100,6 +3100,10 @@ static int mdt_msg_check_version(struct lustre_msg *msg)
         case MDS_SETXATTR:
         case MDS_SET_INFO:
         case MDS_GET_INFO:
+       case MDS_HSM_PROGRESS:
+       case MDS_HSM_REQUEST:
+       case MDS_HSM_CT_REGISTER:
+       case MDS_HSM_CT_UNREGISTER:
         case MDS_QUOTACHECK:
         case MDS_QUOTACTL:
         case QUOTA_DQACQ:
@@ -5625,63 +5629,6 @@ int mdt_obd_postrecov(struct obd_device *obd)
         return rc;
 }
 
-/**
- * Send a copytool req to a client
- * Note this sends a request RPC from a server (MDT) to a client (MDC),
- * backwards of normal comms.
- */
-int mdt_hsm_copytool_send(struct obd_export *exp)
-{
-        struct kuc_hdr *lh;
-        struct hsm_action_list *hal;
-        struct hsm_action_item *hai;
-        int rc, len;
-        ENTRY;
-
-        CWARN("%s: writing to mdc at %s\n", exp->exp_obd->obd_name,
-              libcfs_nid2str(exp->exp_connection->c_peer.nid));
-
-        len = sizeof(*lh) + sizeof(*hal) + MTI_NAME_MAXLEN +
-                /* for mockup below */ 2 * cfs_size_round(sizeof(*hai));
-        OBD_ALLOC(lh, len);
-        if (lh == NULL)
-                RETURN(-ENOMEM);
-
-        lh->kuc_magic = KUC_MAGIC;
-        lh->kuc_transport = KUC_TRANSPORT_HSM;
-        lh->kuc_msgtype = HMT_ACTION_LIST;
-        lh->kuc_msglen = len;
-
-        hal = (struct hsm_action_list *)(lh + 1);
-        hal->hal_version = HAL_VERSION;
-        hal->hal_archive_num = 1;
-        obd_uuid2fsname(hal->hal_fsname, exp->exp_obd->obd_name,
-                        MTI_NAME_MAXLEN);
-
-        /* mock up an action list */
-        hal->hal_count = 2;
-        hai = hai_zero(hal);
-        hai->hai_action = HSMA_ARCHIVE;
-        hai->hai_fid.f_oid = 0xA00A;
-        hai->hai_len = sizeof(*hai);
-        hai = hai_next(hai);
-        hai->hai_action = HSMA_RESTORE;
-        hai->hai_fid.f_oid = 0xB00B;
-        hai->hai_len = sizeof(*hai);
-
-        /* Uses the ldlm reverse import; this rpc will be seen by
-          the ldlm_callback_handler */
-        rc = do_set_info_async(exp->exp_imp_reverse,
-                               LDLM_SET_INFO, LUSTRE_OBD_VERSION,
-                               sizeof(KEY_HSM_COPYTOOL_SEND),
-                               KEY_HSM_COPYTOOL_SEND,
-                               len, lh, NULL);
-
-        OBD_FREE(lh, len);
-
-        RETURN(rc);
-}
-
 static struct obd_ops mdt_obd_device_ops = {
         .o_owner          = THIS_MODULE,
         .o_set_info_async = mdt_obd_set_info_async,
index 5eed275..3e23d61 100644 (file)
@@ -7,28 +7,68 @@
  * it under the terms of the GNU General Public License version 2 only,
  * as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.  A copy is
+ * included in the COPYING file that accompanied this code.
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
+ * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
+ *                          alternatives
+ */
+/*
+ * lustre/mdt/mdt_hsm.c
+ *
+ * Lustre Metadata Target (mdt) request handler
+ *
+ * Author: Aurelien Degremont <aurelien.degremont@cea.fr>
+ * Author: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
  */
 
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include "mdt_internal.h"
 
+/*
+ * fake functions, will be replace by real one with HSM Coordinator patch
+ */
+
+int mdt_hsm_copytool_send(struct obd_export *exp)
+{
+       return 0;
+}
+
+static int mdt_hsm_coordinator_update(struct mdt_thread_info *info,
+                                     struct hsm_progress_kernel *pgs)
+{
+       return 0;
+}
+
+static int mdt_hsm_agent_register_mask(struct mdt_thread_info *info,
+                                      struct obd_uuid *uuid,
+                                      __u32 archive_mask)
+{
+       return 0;
+}
+
+static int mdt_hsm_agent_unregister(struct mdt_thread_info *info,
+                                   struct obd_uuid *uuid)
+{
+       return 0;
+}
+
 /**
  * Update on-disk HSM attributes.
  */
@@ -54,3 +94,66 @@ int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
 
        RETURN(rc);
 }
+
+/**
+ * Extract information coming from a copytool and asks coordinator to update
+ * a request status depending on the update content.
+ *
+ * Copytools could use this to report failure in their process.
+ *
+ * This is HSM_PROGRESS RPC handler.
+ */
+int mdt_hsm_progress(struct mdt_thread_info *info)
+{
+       struct hsm_progress_kernel      *hpk;
+       int                              rc;
+       ENTRY;
+
+       hpk = req_capsule_client_get(info->mti_pill, &RMF_MDS_HSM_PROGRESS);
+       LASSERT(hpk);
+
+       CDEBUG(D_HSM, "Progress on "DFID": len="LPU64" err=%d\n",
+              PFID(&hpk->hpk_fid), hpk->hpk_extent.length, hpk->hpk_errval);
+
+       if (hpk->hpk_errval)
+               CDEBUG(D_HSM, "Copytool progress on "DFID" failed (%d); %s.\n",
+                      PFID(&hpk->hpk_fid), hpk->hpk_errval,
+                      hpk->hpk_flags & HP_FLAG_RETRY ? "will retry" : "fatal");
+
+       if (hpk->hpk_flags & HP_FLAG_COMPLETED)
+               CDEBUG(D_HSM, "Finished "DFID" (%d) cancel cookie="LPX64"\n",
+                      PFID(&hpk->hpk_fid), hpk->hpk_errval, hpk->hpk_cookie);
+
+       rc = mdt_hsm_coordinator_update(info, hpk);
+
+       RETURN(rc);
+}
+
+int mdt_hsm_ct_register(struct mdt_thread_info *info)
+{
+       struct ptlrpc_request *req = mdt_info_req(info);
+       __u32 *archives;
+       int rc;
+       ENTRY;
+
+       archives = req_capsule_client_get(info->mti_pill, &RMF_MDS_HSM_ARCHIVE);
+       LASSERT(archives);
+
+       /* XXX: directly include this function here? */
+       rc = mdt_hsm_agent_register_mask(info, &req->rq_export->exp_client_uuid,
+                                        *archives);
+
+       RETURN(rc);
+}
+
+int mdt_hsm_ct_unregister(struct mdt_thread_info *info)
+{
+       struct ptlrpc_request *req = mdt_info_req(info);
+       int rc;
+       ENTRY;
+
+       /* XXX: directly include this function here? */
+       rc = mdt_hsm_agent_unregister(info, &req->rq_export->exp_client_uuid);
+
+       RETURN(rc);
+}
index 210eac4..9a4c5c4 100644 (file)
@@ -772,6 +772,11 @@ __u32 mdt_identity_get_perm(struct md_identity *, __u32, lnet_nid_t);
 
 int mdt_pack_remote_perm(struct mdt_thread_info *, struct mdt_object *, void *);
 
+/* mdt/mdt_hsm.c */
+int mdt_hsm_progress(struct mdt_thread_info *info);
+int mdt_hsm_ct_register(struct mdt_thread_info *info);
+int mdt_hsm_ct_unregister(struct mdt_thread_info *info);
+
 extern struct lu_context_key       mdt_thread_key;
 /* debug issues helper starts here*/
 static inline int mdt_fail_write(const struct lu_env *env,
index ac4894b..76fc974 100644 (file)
@@ -141,7 +141,12 @@ DEF_MDT_HDL(0              | HABEO_REFERO, MDS_PIN,          mdt_pin),
 DEF_MDT_HDL_VAR(0,                     MDS_SYNC,         mdt_sync),
 DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO,        MDS_IS_SUBDIR,    mdt_is_subdir),
 DEF_MDT_HDL(0,                         MDS_QUOTACHECK,   mdt_quotacheck),
-DEF_MDT_HDL(0,                         MDS_QUOTACTL,     mdt_quotactl)
+DEF_MDT_HDL(0,                         MDS_QUOTACTL,     mdt_quotactl),
+DEF_MDT_HDL(0          | HABEO_REFERO, MDS_HSM_PROGRESS, mdt_hsm_progress),
+DEF_MDT_HDL(0          | HABEO_REFERO, MDS_HSM_CT_REGISTER,
+                                               mdt_hsm_ct_register),
+DEF_MDT_HDL(0          | HABEO_REFERO, MDS_HSM_CT_UNREGISTER,
+                                               mdt_hsm_ct_unregister),
 };
 
 #define DEF_OBD_HDL(flags, name, fn)                                   \
index 14891eb..38f3c29 100644 (file)
@@ -586,6 +586,16 @@ static const struct req_msg_field *ost_get_fiemap_server[] = {
         &RMF_FIEMAP_VAL
 };
 
+static const struct req_msg_field *mdt_hsm_progress[] = {
+       &RMF_PTLRPC_BODY,
+       &RMF_MDS_HSM_PROGRESS,
+};
+
+static const struct req_msg_field *mdt_hsm_ct_register[] = {
+       &RMF_PTLRPC_BODY,
+       &RMF_MDS_HSM_ARCHIVE,
+};
+
 static struct req_format *req_formats[] = {
         &RQF_OBD_PING,
         &RQF_OBD_SET_INFO,
@@ -625,6 +635,9 @@ static struct req_format *req_formats[] = {
         &RQF_MDS_REINT_SETXATTR,
         &RQF_MDS_QUOTACHECK,
         &RQF_MDS_QUOTACTL,
+       &RQF_MDS_HSM_PROGRESS,
+       &RQF_MDS_HSM_CT_REGISTER,
+       &RQF_MDS_HSM_CT_UNREGISTER,
         &RQF_QC_CALLBACK,
         &RQF_OST_CONNECT,
         &RQF_OST_DISCONNECT,
@@ -1004,6 +1017,22 @@ struct req_msg_field RMF_IDX_INFO =
                    lustre_swab_idx_info, NULL);
 EXPORT_SYMBOL(RMF_IDX_INFO);
 
+struct req_msg_field RMF_MDS_HSM_PROGRESS =
+       DEFINE_MSGF("hsm_progress", 0, sizeof(struct hsm_progress_kernel),
+                   lustre_swab_hsm_progress_kernel, NULL);
+EXPORT_SYMBOL(RMF_MDS_HSM_PROGRESS);
+
+struct req_msg_field RMF_MDS_HSM_USER_ITEM =
+       DEFINE_MSGF("hsm_user_item", RMF_F_STRUCT_ARRAY,
+                   sizeof(struct hsm_user_item), lustre_swab_hsm_user_item,
+                   NULL);
+EXPORT_SYMBOL(RMF_MDS_HSM_USER_ITEM);
+
+struct req_msg_field RMF_MDS_HSM_ARCHIVE =
+       DEFINE_MSGF("hsm_archive", 0,
+                   sizeof(__u32), lustre_swab_generic_32s, NULL);
+EXPORT_SYMBOL(RMF_MDS_HSM_ARCHIVE);
+
 /*
  * Request formats.
  */
@@ -1303,6 +1332,18 @@ struct req_format RQF_MDS_READPAGE =
                         mdt_body_capa, mdt_body_only);
 EXPORT_SYMBOL(RQF_MDS_READPAGE);
 
+struct req_format RQF_MDS_HSM_PROGRESS =
+       DEFINE_REQ_FMT0("MDS_HSM_PROGRESS", mdt_hsm_progress, empty);
+EXPORT_SYMBOL(RQF_MDS_HSM_PROGRESS);
+
+struct req_format RQF_MDS_HSM_CT_REGISTER =
+       DEFINE_REQ_FMT0("MDS_HSM_CT_REGISTER", mdt_hsm_ct_register, empty);
+EXPORT_SYMBOL(RQF_MDS_HSM_CT_REGISTER);
+
+struct req_format RQF_MDS_HSM_CT_UNREGISTER =
+       DEFINE_REQ_FMT0("MDS_HSM_CT_UNREGISTER", empty, empty);
+EXPORT_SYMBOL(RQF_MDS_HSM_CT_UNREGISTER);
+
 /* This is for split */
 struct req_format RQF_MDS_WRITEPAGE =
         DEFINE_REQ_FMT0("MDS_WRITEPAGE",
index 69ef3bf..ad4777c 100644 (file)
@@ -94,6 +94,13 @@ struct ll_rpc_opcode {
         { MDS_WRITEPAGE,    "mds_writepage" },
         { MDS_IS_SUBDIR,    "mds_is_subdir" },
         { MDS_GET_INFO,     "mds_get_info" },
+       { MDS_HSM_STATE_GET, "mds_hsm_state_get" },
+       { MDS_HSM_STATE_SET, "mds_hsm_state_set" },
+       { MDS_HSM_ACTION,   "mds_hsm_action" },
+       { MDS_HSM_PROGRESS, "mds_hsm_progress" },
+       { MDS_HSM_REQUEST,  "mds_hsm_request" },
+       { MDS_HSM_CT_REGISTER, "mds_hsm_ct_register" },
+       { MDS_HSM_CT_UNREGISTER, "mds_hsm_ct_unregister" },
         { LDLM_ENQUEUE,     "ldlm_enqueue" },
         { LDLM_CONVERT,     "ldlm_convert" },
         { LDLM_CANCEL,      "ldlm_cancel" },
index c0899b2..12db432 100644 (file)
@@ -2485,33 +2485,18 @@ void lustre_swab_hsm_state(struct hsm_state_set_ioc *hssi)
 }
 EXPORT_SYMBOL(lustre_swab_hsm_state);
 
-void lustre_swab_hsm_user_request(struct hsm_user_request *hur)
+void lustre_swab_hsm_extent(struct hsm_extent *extent)
 {
-        int i;
-
-        __swab32s(&hur->hur_action);
-        __swab32s(&hur->hur_itemcount);
-        __swab32s(&hur->hur_data_len);
-        for (i = 0; i < hur->hur_itemcount; i++) {
-                struct hsm_user_item *hui = &hur->hur_user_item[i];
-                lustre_swab_lu_fid(&hui->hui_fid);
-                __swab64s(&hui->hui_extent.offset);
-                __swab64s(&hui->hui_extent.length);
-        }
-        /* Note: data blob is not swabbed here */
+       __swab64s(&extent->offset);
+       __swab64s(&extent->length);
 }
-EXPORT_SYMBOL(lustre_swab_hsm_user_request);
 
-void lustre_swab_hsm_progress(struct hsm_progress *hp)
+void lustre_swab_hsm_user_item(struct hsm_user_item *hui)
 {
-        lustre_swab_lu_fid(&hp->hp_fid);
-        __swab64s(&hp->hp_cookie);
-        __swab64s(&hp->hp_extent.offset);
-        __swab64s(&hp->hp_extent.length);
-        __swab16s(&hp->hp_flags);
-        __swab16s(&hp->hp_errval);
+       lustre_swab_lu_fid(&hui->hui_fid);
+       lustre_swab_hsm_extent(&hui->hui_extent);
 }
-EXPORT_SYMBOL(lustre_swab_hsm_progress);
+EXPORT_SYMBOL(lustre_swab_hsm_user_item);
 
 void lustre_swab_layout_intent(struct layout_intent *li)
 {
@@ -2521,3 +2506,15 @@ void lustre_swab_layout_intent(struct layout_intent *li)
        __swab64s(&li->li_end);
 }
 EXPORT_SYMBOL(lustre_swab_layout_intent);
+
+void lustre_swab_hsm_progress_kernel(struct hsm_progress_kernel *hpk)
+{
+       lustre_swab_lu_fid(&hpk->hpk_fid);
+       __swab64s(&hpk->hpk_cookie);
+       __swab64s(&hpk->hpk_extent.offset);
+       __swab64s(&hpk->hpk_extent.length);
+       __swab16s(&hpk->hpk_flags);
+       __swab16s(&hpk->hpk_errval);
+}
+EXPORT_SYMBOL(lustre_swab_hsm_progress_kernel);
+
index afa6ae9..bfff3bc 100644 (file)
 #include <lustre_disk.h>
 void lustre_assert_wire_constants(void)
 {
-        /* Wire protocol assertions generated by 'wirecheck'
-         * (make -C lustre/utils newwiretest)
-         * running on Linux centos6-bis 2.6.32-279.2.1.el6-head #0 SMP Thu Aug 9 23:25:09 CEST 2012 x
-         * with gcc version 4.4.6 20110731 (Red Hat 4.4.6-3) (GCC)  */
+        /* Wire protocol assertions generated by 'wirecheck'
+         * (make -C lustre/utils newwiretest)
+         * running on Linux centos6-bis 2.6.32-279.2.1.el6-head #0 SMP Thu Aug 9 23:25:09 CEST 2012 x
+         * with gcc version 4.4.6 20110731 (Red Hat 4.4.6-3) (GCC)  */
 
 
-        /* Constants... */
-        LASSERTF(PTL_RPC_MSG_REQUEST == 4711, "found %lld\n",
-                 (long long)PTL_RPC_MSG_REQUEST);
-        LASSERTF(PTL_RPC_MSG_ERR == 4712, "found %lld\n",
-                 (long long)PTL_RPC_MSG_ERR);
-        LASSERTF(PTL_RPC_MSG_REPLY == 4713, "found %lld\n",
-                 (long long)PTL_RPC_MSG_REPLY);
-        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",
-                 (long long)OST_GETATTR);
-        LASSERTF(OST_SETATTR == 2, "found %lld\n",
-                 (long long)OST_SETATTR);
-        LASSERTF(OST_READ == 3, "found %lld\n",
-                 (long long)OST_READ);
-        LASSERTF(OST_WRITE == 4, "found %lld\n",
-                 (long long)OST_WRITE);
-        LASSERTF(OST_CREATE == 5, "found %lld\n",
-                 (long long)OST_CREATE);
-        LASSERTF(OST_DESTROY == 6, "found %lld\n",
-                 (long long)OST_DESTROY);
-        LASSERTF(OST_GET_INFO == 7, "found %lld\n",
-                 (long long)OST_GET_INFO);
-        LASSERTF(OST_CONNECT == 8, "found %lld\n",
-                 (long long)OST_CONNECT);
-        LASSERTF(OST_DISCONNECT == 9, "found %lld\n",
-                 (long long)OST_DISCONNECT);
-        LASSERTF(OST_PUNCH == 10, "found %lld\n",
-                 (long long)OST_PUNCH);
-        LASSERTF(OST_OPEN == 11, "found %lld\n",
-                 (long long)OST_OPEN);
-        LASSERTF(OST_CLOSE == 12, "found %lld\n",
-                 (long long)OST_CLOSE);
-        LASSERTF(OST_STATFS == 13, "found %lld\n",
-                 (long long)OST_STATFS);
-        LASSERTF(OST_SYNC == 16, "found %lld\n",
-                 (long long)OST_SYNC);
-        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",
-                 (long long)OST_QUOTACTL);
-        LASSERTF(OST_QUOTA_ADJUST_QUNIT == 20, "found %lld\n",
-                 (long long)OST_QUOTA_ADJUST_QUNIT);
-        LASSERTF(OST_LAST_OPC == 21, "found %lld\n",
-                 (long long)OST_LAST_OPC);
-        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",
-                 (long long)MDS_GETATTR_NAME);
-        LASSERTF(MDS_CLOSE == 35, "found %lld\n",
-                 (long long)MDS_CLOSE);
-        LASSERTF(MDS_REINT == 36, "found %lld\n",
-                 (long long)MDS_REINT);
-        LASSERTF(MDS_READPAGE == 37, "found %lld\n",
-                 (long long)MDS_READPAGE);
-        LASSERTF(MDS_CONNECT == 38, "found %lld\n",
-                 (long long)MDS_CONNECT);
-        LASSERTF(MDS_DISCONNECT == 39, "found %lld\n",
-                 (long long)MDS_DISCONNECT);
-        LASSERTF(MDS_GETSTATUS == 40, "found %lld\n",
-                 (long long)MDS_GETSTATUS);
-        LASSERTF(MDS_STATFS == 41, "found %lld\n",
-                 (long long)MDS_STATFS);
-        LASSERTF(MDS_PIN == 42, "found %lld\n",
-                 (long long)MDS_PIN);
-        LASSERTF(MDS_UNPIN == 43, "found %lld\n",
-                 (long long)MDS_UNPIN);
-        LASSERTF(MDS_SYNC == 44, "found %lld\n",
-                 (long long)MDS_SYNC);
-        LASSERTF(MDS_DONE_WRITING == 45, "found %lld\n",
-                 (long long)MDS_DONE_WRITING);
-        LASSERTF(MDS_SET_INFO == 46, "found %lld\n",
-                 (long long)MDS_SET_INFO);
-        LASSERTF(MDS_QUOTACHECK == 47, "found %lld\n",
-                 (long long)MDS_QUOTACHECK);
-        LASSERTF(MDS_QUOTACTL == 48, "found %lld\n",
-                 (long long)MDS_QUOTACTL);
-        LASSERTF(MDS_GETXATTR == 49, "found %lld\n",
-                 (long long)MDS_GETXATTR);
-        LASSERTF(MDS_SETXATTR == 50, "found %lld\n",
-                 (long long)MDS_SETXATTR);
-        LASSERTF(MDS_WRITEPAGE == 51, "found %lld\n",
-                 (long long)MDS_WRITEPAGE);
-        LASSERTF(MDS_IS_SUBDIR == 52, "found %lld\n",
-                 (long long)MDS_IS_SUBDIR);
-        LASSERTF(MDS_GET_INFO == 53, "found %lld\n",
-                 (long long)MDS_GET_INFO);
-        LASSERTF(MDS_LAST_OPC == 54, "found %lld\n",
-                 (long long)MDS_LAST_OPC);
-        LASSERTF(REINT_SETATTR == 1, "found %lld\n",
-                 (long long)REINT_SETATTR);
-        LASSERTF(REINT_CREATE == 2, "found %lld\n",
-                 (long long)REINT_CREATE);
-        LASSERTF(REINT_LINK == 3, "found %lld\n",
-                 (long long)REINT_LINK);
-        LASSERTF(REINT_UNLINK == 4, "found %lld\n",
-                 (long long)REINT_UNLINK);
-        LASSERTF(REINT_RENAME == 5, "found %lld\n",
-                 (long long)REINT_RENAME);
-        LASSERTF(REINT_OPEN == 6, "found %lld\n",
-                 (long long)REINT_OPEN);
-        LASSERTF(REINT_SETXATTR == 7, "found %lld\n",
-                 (long long)REINT_SETXATTR);
-        LASSERTF(REINT_MAX == 8, "found %lld\n",
-                 (long long)REINT_MAX);
-        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",
-                 (long long)MDS_STATUS_LOV);
-        LASSERTF(LUSTRE_BFLAG_UNCOMMITTED_WRITES == 1, "found %lld\n",
-                 (long long)LUSTRE_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(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",
-                 (long long)LDLM_CONVERT);
-        LASSERTF(LDLM_CANCEL == 103, "found %lld\n",
-                 (long long)LDLM_CANCEL);
-        LASSERTF(LDLM_BL_CALLBACK == 104, "found %lld\n",
-                 (long long)LDLM_BL_CALLBACK);
-        LASSERTF(LDLM_CP_CALLBACK == 105, "found %lld\n",
-                 (long long)LDLM_CP_CALLBACK);
-        LASSERTF(LDLM_GL_CALLBACK == 106, "found %lld\n",
-                 (long long)LDLM_GL_CALLBACK);
-        LASSERTF(LDLM_SET_INFO == 107, "found %lld\n",
-                 (long long)LDLM_SET_INFO);
-        LASSERTF(LDLM_LAST_OPC == 108, "found %lld\n",
-                 (long long)LDLM_LAST_OPC);
-        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",
-                 (long long)LCK_PW);
-        LASSERTF(LCK_PR == 4, "found %lld\n",
-                 (long long)LCK_PR);
-        LASSERTF(LCK_CW == 8, "found %lld\n",
-                 (long long)LCK_CW);
-        LASSERTF(LCK_CR == 16, "found %lld\n",
-                 (long long)LCK_CR);
-        LASSERTF(LCK_NL == 32, "found %lld\n",
-                 (long long)LCK_NL);
-        LASSERTF(LCK_GROUP == 64, "found %lld\n",
-                 (long long)LCK_GROUP);
-        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",
-                 (long long)LCK_MODE_NUM);
-        CLASSERT(LDLM_PLAIN == 10);
-        CLASSERT(LDLM_EXTENT == 11);
-        CLASSERT(LDLM_FLOCK == 12);
-        CLASSERT(LDLM_IBITS == 13);
-        CLASSERT(LDLM_MAX_TYPE == 14);
-        CLASSERT(LUSTRE_RES_ID_SEQ_OFF == 0);
-        CLASSERT(LUSTRE_RES_ID_VER_OID_OFF == 1);
-        CLASSERT(LUSTRE_RES_ID_QUOTA_SEQ_OFF == 2);
-        CLASSERT(LUSTRE_RES_ID_QUOTA_VER_OID_OFF == 3);
-        CLASSERT(LUSTRE_RES_ID_HSH_OFF == 3);
-        CLASSERT(LQUOTA_TYPE_USR == 0);
-        CLASSERT(LQUOTA_TYPE_GRP == 1);
-        CLASSERT(LQUOTA_RES_MD == 1);
-        CLASSERT(LQUOTA_RES_DT == 2);
-        LASSERTF(OBD_PING == 400, "found %lld\n",
-                 (long long)OBD_PING);
-        LASSERTF(OBD_LOG_CANCEL == 401, "found %lld\n",
-                 (long long)OBD_LOG_CANCEL);
-        LASSERTF(OBD_QC_CALLBACK == 402, "found %lld\n",
-                 (long long)OBD_QC_CALLBACK);
-        LASSERTF(OBD_IDX_READ == 403, "found %lld\n",
-                 (long long)OBD_IDX_READ);
-        LASSERTF(OBD_LAST_OPC == 404, "found %lld\n",
-                 (long long)OBD_LAST_OPC);
-        LASSERTF(QUOTA_DQACQ == 601, "found %lld\n",
-                 (long long)QUOTA_DQACQ);
-        LASSERTF(QUOTA_DQREL == 602, "found %lld\n",
-                 (long long)QUOTA_DQREL);
-        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",
-                 (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(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 */
+       /* Constants... */
+       LASSERTF(PTL_RPC_MSG_REQUEST == 4711, "found %lld\n",
+                (long long)PTL_RPC_MSG_REQUEST);
+       LASSERTF(PTL_RPC_MSG_ERR == 4712, "found %lld\n",
+                (long long)PTL_RPC_MSG_ERR);
+       LASSERTF(PTL_RPC_MSG_REPLY == 4713, "found %lld\n",
+                (long long)PTL_RPC_MSG_REPLY);
+       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",
+                (long long)OST_GETATTR);
+       LASSERTF(OST_SETATTR == 2, "found %lld\n",
+                (long long)OST_SETATTR);
+       LASSERTF(OST_READ == 3, "found %lld\n",
+                (long long)OST_READ);
+       LASSERTF(OST_WRITE == 4, "found %lld\n",
+                (long long)OST_WRITE);
+       LASSERTF(OST_CREATE == 5, "found %lld\n",
+                (long long)OST_CREATE);
+       LASSERTF(OST_DESTROY == 6, "found %lld\n",
+                (long long)OST_DESTROY);
+       LASSERTF(OST_GET_INFO == 7, "found %lld\n",
+                (long long)OST_GET_INFO);
+       LASSERTF(OST_CONNECT == 8, "found %lld\n",
+                (long long)OST_CONNECT);
+       LASSERTF(OST_DISCONNECT == 9, "found %lld\n",
+                (long long)OST_DISCONNECT);
+       LASSERTF(OST_PUNCH == 10, "found %lld\n",
+                (long long)OST_PUNCH);
+       LASSERTF(OST_OPEN == 11, "found %lld\n",
+                (long long)OST_OPEN);
+       LASSERTF(OST_CLOSE == 12, "found %lld\n",
+                (long long)OST_CLOSE);
+       LASSERTF(OST_STATFS == 13, "found %lld\n",
+                (long long)OST_STATFS);
+       LASSERTF(OST_SYNC == 16, "found %lld\n",
+                (long long)OST_SYNC);
+       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",
+                (long long)OST_QUOTACTL);
+       LASSERTF(OST_QUOTA_ADJUST_QUNIT == 20, "found %lld\n",
+                (long long)OST_QUOTA_ADJUST_QUNIT);
+       LASSERTF(OST_LAST_OPC == 21, "found %lld\n",
+                (long long)OST_LAST_OPC);
+       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",
+                (long long)MDS_GETATTR_NAME);
+       LASSERTF(MDS_CLOSE == 35, "found %lld\n",
+                (long long)MDS_CLOSE);
+       LASSERTF(MDS_REINT == 36, "found %lld\n",
+                (long long)MDS_REINT);
+       LASSERTF(MDS_READPAGE == 37, "found %lld\n",
+                (long long)MDS_READPAGE);
+       LASSERTF(MDS_CONNECT == 38, "found %lld\n",
+                (long long)MDS_CONNECT);
+       LASSERTF(MDS_DISCONNECT == 39, "found %lld\n",
+                (long long)MDS_DISCONNECT);
+       LASSERTF(MDS_GETSTATUS == 40, "found %lld\n",
+                (long long)MDS_GETSTATUS);
+       LASSERTF(MDS_STATFS == 41, "found %lld\n",
+                (long long)MDS_STATFS);
+       LASSERTF(MDS_PIN == 42, "found %lld\n",
+                (long long)MDS_PIN);
+       LASSERTF(MDS_UNPIN == 43, "found %lld\n",
+                (long long)MDS_UNPIN);
+       LASSERTF(MDS_SYNC == 44, "found %lld\n",
+                (long long)MDS_SYNC);
+       LASSERTF(MDS_DONE_WRITING == 45, "found %lld\n",
+                (long long)MDS_DONE_WRITING);
+       LASSERTF(MDS_SET_INFO == 46, "found %lld\n",
+                (long long)MDS_SET_INFO);
+       LASSERTF(MDS_QUOTACHECK == 47, "found %lld\n",
+                (long long)MDS_QUOTACHECK);
+       LASSERTF(MDS_QUOTACTL == 48, "found %lld\n",
+                (long long)MDS_QUOTACTL);
+       LASSERTF(MDS_GETXATTR == 49, "found %lld\n",
+                (long long)MDS_GETXATTR);
+       LASSERTF(MDS_SETXATTR == 50, "found %lld\n",
+                (long long)MDS_SETXATTR);
+       LASSERTF(MDS_WRITEPAGE == 51, "found %lld\n",
+                (long long)MDS_WRITEPAGE);
+       LASSERTF(MDS_IS_SUBDIR == 52, "found %lld\n",
+                (long long)MDS_IS_SUBDIR);
+       LASSERTF(MDS_GET_INFO == 53, "found %lld\n",
+                (long long)MDS_GET_INFO);
+       LASSERTF(MDS_HSM_STATE_GET == 54, "found %lld\n",
+                (long long)MDS_HSM_STATE_GET);
+       LASSERTF(MDS_HSM_STATE_SET == 55, "found %lld\n",
+                (long long)MDS_HSM_STATE_SET);
+       LASSERTF(MDS_HSM_ACTION == 56, "found %lld\n",
+                (long long)MDS_HSM_ACTION);
+       LASSERTF(MDS_HSM_PROGRESS == 57, "found %lld\n",
+                (long long)MDS_HSM_PROGRESS);
+       LASSERTF(MDS_HSM_REQUEST == 58, "found %lld\n",
+                (long long)MDS_HSM_REQUEST);
+       LASSERTF(MDS_HSM_CT_REGISTER == 59, "found %lld\n",
+                (long long)MDS_HSM_CT_REGISTER);
+       LASSERTF(MDS_HSM_CT_UNREGISTER == 60, "found %lld\n",
+                (long long)MDS_HSM_CT_UNREGISTER);
+       LASSERTF(MDS_LAST_OPC == 61, "found %lld\n",
+                (long long)MDS_LAST_OPC);
+       LASSERTF(REINT_SETATTR == 1, "found %lld\n",
+                (long long)REINT_SETATTR);
+       LASSERTF(REINT_CREATE == 2, "found %lld\n",
+                (long long)REINT_CREATE);
+       LASSERTF(REINT_LINK == 3, "found %lld\n",
+                (long long)REINT_LINK);
+       LASSERTF(REINT_UNLINK == 4, "found %lld\n",
+                (long long)REINT_UNLINK);
+       LASSERTF(REINT_RENAME == 5, "found %lld\n",
+                (long long)REINT_RENAME);
+       LASSERTF(REINT_OPEN == 6, "found %lld\n",
+                (long long)REINT_OPEN);
+       LASSERTF(REINT_SETXATTR == 7, "found %lld\n",
+                (long long)REINT_SETXATTR);
+       LASSERTF(REINT_MAX == 8, "found %lld\n",
+                (long long)REINT_MAX);
+       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",
+                (long long)MDS_STATUS_LOV);
+       LASSERTF(LUSTRE_BFLAG_UNCOMMITTED_WRITES == 1, "found %lld\n",
+                (long long)LUSTRE_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(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",
+                (long long)LDLM_CONVERT);
+       LASSERTF(LDLM_CANCEL == 103, "found %lld\n",
+                (long long)LDLM_CANCEL);
+       LASSERTF(LDLM_BL_CALLBACK == 104, "found %lld\n",
+                (long long)LDLM_BL_CALLBACK);
+       LASSERTF(LDLM_CP_CALLBACK == 105, "found %lld\n",
+                (long long)LDLM_CP_CALLBACK);
+       LASSERTF(LDLM_GL_CALLBACK == 106, "found %lld\n",
+                (long long)LDLM_GL_CALLBACK);
+       LASSERTF(LDLM_SET_INFO == 107, "found %lld\n",
+                (long long)LDLM_SET_INFO);
+       LASSERTF(LDLM_LAST_OPC == 108, "found %lld\n",
+                (long long)LDLM_LAST_OPC);
+       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",
+                (long long)LCK_PW);
+       LASSERTF(LCK_PR == 4, "found %lld\n",
+                (long long)LCK_PR);
+       LASSERTF(LCK_CW == 8, "found %lld\n",
+                (long long)LCK_CW);
+       LASSERTF(LCK_CR == 16, "found %lld\n",
+                (long long)LCK_CR);
+       LASSERTF(LCK_NL == 32, "found %lld\n",
+                (long long)LCK_NL);
+       LASSERTF(LCK_GROUP == 64, "found %lld\n",
+                (long long)LCK_GROUP);
+       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",
+                (long long)LCK_MODE_NUM);
+       CLASSERT(LDLM_PLAIN == 10);
+       CLASSERT(LDLM_EXTENT == 11);
+       CLASSERT(LDLM_FLOCK == 12);
+       CLASSERT(LDLM_IBITS == 13);
+       CLASSERT(LDLM_MAX_TYPE == 14);
+       CLASSERT(LUSTRE_RES_ID_SEQ_OFF == 0);
+       CLASSERT(LUSTRE_RES_ID_VER_OID_OFF == 1);
+       CLASSERT(LUSTRE_RES_ID_QUOTA_SEQ_OFF == 2);
+       CLASSERT(LUSTRE_RES_ID_QUOTA_VER_OID_OFF == 3);
+       CLASSERT(LUSTRE_RES_ID_HSH_OFF == 3);
+       CLASSERT(LQUOTA_TYPE_USR == 0);
+       CLASSERT(LQUOTA_TYPE_GRP == 1);
+       CLASSERT(LQUOTA_RES_MD == 1);
+       CLASSERT(LQUOTA_RES_DT == 2);
+       LASSERTF(OBD_PING == 400, "found %lld\n",
+                (long long)OBD_PING);
+       LASSERTF(OBD_LOG_CANCEL == 401, "found %lld\n",
+                (long long)OBD_LOG_CANCEL);
+       LASSERTF(OBD_QC_CALLBACK == 402, "found %lld\n",
+                (long long)OBD_QC_CALLBACK);
+       LASSERTF(OBD_IDX_READ == 403, "found %lld\n",
+                (long long)OBD_IDX_READ);
+       LASSERTF(OBD_LAST_OPC == 404, "found %lld\n",
+                (long long)OBD_LAST_OPC);
+       LASSERTF(QUOTA_DQACQ == 601, "found %lld\n",
+                (long long)QUOTA_DQACQ);
+       LASSERTF(QUOTA_DQREL == 602, "found %lld\n",
+                (long long)QUOTA_DQREL);
+       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",
+                (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(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",
-                 (long long)(int)sizeof(struct obd_uuid));
+       /* Checks for struct obd_uuid */
+       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 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) == 32, "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(LMA_INCOMPAT_SUPP == 0x0, "found %lld\n",
-                 (long long)LMA_INCOMPAT_SUPP);
-        LASSERTF(LMAI_RELEASED == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)LMAI_RELEASED);
-        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 lustre_mdt_attrs */
+       LASSERTF((int)sizeof(struct lustre_mdt_attrs) == 32, "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(LMAI_RELEASED == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)LMAI_RELEASED);
+       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 som_attrs */
-        LASSERTF((int)sizeof(struct som_attrs) == 40, "found %lld\n",
-                 (long long)(int)sizeof(struct som_attrs));
-        LASSERTF((int)offsetof(struct som_attrs, som_compat) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_compat));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_compat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_compat));
-        LASSERTF((int)offsetof(struct som_attrs, som_incompat) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_incompat));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_incompat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_incompat));
-        LASSERTF((int)offsetof(struct som_attrs, som_ioepoch) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_ioepoch));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_ioepoch) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_ioepoch));
-        LASSERTF((int)offsetof(struct som_attrs, som_size) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_size));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_size) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_size));
-        LASSERTF((int)offsetof(struct som_attrs, som_blocks) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_blocks));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_blocks) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_blocks));
-        LASSERTF((int)offsetof(struct som_attrs, som_mountid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_mountid));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_mountid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_mountid));
+       /* Checks for struct som_attrs */
+       LASSERTF((int)sizeof(struct som_attrs) == 40, "found %lld\n",
+                (long long)(int)sizeof(struct som_attrs));
+       LASSERTF((int)offsetof(struct som_attrs, som_compat) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_compat));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_compat) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_compat));
+       LASSERTF((int)offsetof(struct som_attrs, som_incompat) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_incompat));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_incompat) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_incompat));
+       LASSERTF((int)offsetof(struct som_attrs, som_ioepoch) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_ioepoch));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_ioepoch) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_ioepoch));
+       LASSERTF((int)offsetof(struct som_attrs, som_size) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_size));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_size) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_size));
+       LASSERTF((int)offsetof(struct som_attrs, som_blocks) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_blocks));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_blocks) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_blocks));
+       LASSERTF((int)offsetof(struct som_attrs, som_mountid) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_mountid));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_mountid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_mountid));
 
-        /* Checks for struct hsm_attrs */
-        LASSERTF((int)sizeof(struct hsm_attrs) == 24, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_attrs));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_compat) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_compat));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_compat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_compat));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_flags));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_flags));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_id) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_arch_id));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_ver) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_arch_ver));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver));
+       /* Checks for struct hsm_attrs */
+       LASSERTF((int)sizeof(struct hsm_attrs) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_attrs));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_compat) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_compat));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_compat) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_compat));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_flags));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_flags));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_id) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_arch_id));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_ver) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_arch_ver));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver));
 
-        /* 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_SPECIAL == 0x0000000200000004ULL, "found 0x%.16llxULL\n",
-                 (long long)FID_SEQ_SPECIAL);
-        LASSERTF(FID_SEQ_QUOTA == 0x0000000200000005ULL, "found 0x%.16llxULL\n",
-                 (long long)FID_SEQ_QUOTA);
-        LASSERTF(FID_SEQ_QUOTA_GLB == 0x0000000200000006ULL, "found 0x%.16llxULL\n",
-                 (long long)FID_SEQ_QUOTA_GLB);
-        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);
-        LASSERTF(FID_OID_SPECIAL_BFL == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_SPECIAL_BFL);
-        LASSERTF(FID_OID_DOT_LUSTRE == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_DOT_LUSTRE);
-        LASSERTF(FID_OID_DOT_LUSTRE_OBF == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_DOT_LUSTRE_OBF);
+       /* 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_SPECIAL == 0x0000000200000004ULL, "found 0x%.16llxULL\n",
+                       (long long)FID_SEQ_SPECIAL);
+       LASSERTF(FID_SEQ_QUOTA == 0x0000000200000005ULL, "found 0x%.16llxULL\n",
+                       (long long)FID_SEQ_QUOTA);
+       LASSERTF(FID_SEQ_QUOTA_GLB == 0x0000000200000006ULL, "found 0x%.16llxULL\n",
+                       (long long)FID_SEQ_QUOTA_GLB);
+       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);
+       LASSERTF(FID_OID_SPECIAL_BFL == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)FID_OID_SPECIAL_BFL);
+       LASSERTF(FID_OID_DOT_LUSTRE == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)FID_OID_DOT_LUSTRE);
+       LASSERTF(FID_OID_DOT_LUSTRE_OBF == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)FID_OID_DOT_LUSTRE_OBF);
 
-        /* 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 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 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 union lu_page */
-        LASSERTF((int)sizeof(union lu_page) == 4096, "found %lld\n",
-                 (long long)(int)sizeof(union lu_page));
+       /* 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 union lu_page */
+       LASSERTF((int)sizeof(union lu_page) == 4096, "found %lld\n",
+                (long long)(int)sizeof(union lu_page));
 
-        /* Checks for struct lustre_handle */
-        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",
-                 (long long)(int)offsetof(struct lustre_handle, cookie));
-        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_handle */
+       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",
+                (long long)(int)offsetof(struct lustre_handle, cookie));
+       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",
-                 (long long)(int)sizeof(struct lustre_msg_v2));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_bufcount));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_secflvr));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_magic));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_repsize));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_cksum));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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 lustre_msg_v2 */
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_bufcount));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_secflvr));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_magic));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_repsize));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_cksum));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_flags));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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_v3) == 184, "found %lld\n",
-                 (long long)(int)sizeof(struct ptlrpc_body_v3));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_handle) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_handle));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_type) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_type));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_version) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_version));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_opc) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_opc));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_status) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_status));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_xid) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_xid));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_seen) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_seen));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_committed) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_committed));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_transno) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_transno));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_flags) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_flags));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_op_flags) == 60, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_op_flags));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_timeout) == 68, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_timeout));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_service_time) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_service_time));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_limit) == 76, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_limit));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_slv) == 80, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_slv));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv));
-        CLASSERT(PTLRPC_NUM_VERSIONS == 4);
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_pre_versions) == 88, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_pre_versions));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding));
-        CLASSERT(JOBSTATS_JOBID_SIZE == 32);
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_jobid) == 152, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_jobid));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid));
+       /* Checks for struct ptlrpc_body */
+       LASSERTF((int)sizeof(struct ptlrpc_body_v3) == 184, "found %lld\n",
+                (long long)(int)sizeof(struct ptlrpc_body_v3));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_handle) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_handle));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_type) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_type));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_version) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_version));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_opc) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_opc));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_status) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_status));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_xid) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_xid));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_seen) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_seen));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_committed) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_committed));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_transno) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_transno));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_flags) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_flags));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_op_flags) == 60, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_op_flags));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_timeout) == 68, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_timeout));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_service_time) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_service_time));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_limit) == 76, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_limit));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_slv) == 80, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_slv));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv));
+       CLASSERT(PTLRPC_NUM_VERSIONS == 4);
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_pre_versions) == 88, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_pre_versions));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == 32, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == 32, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding));
+       CLASSERT(JOBSTATS_JOBID_SIZE == 32);
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_jobid) == 152, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_jobid));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid) == 32, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid));
        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_handle) == (int)offsetof(struct ptlrpc_body_v2, pb_handle), "%d != %d\n",
                 (int)offsetof(struct ptlrpc_body_v3, pb_handle), (int)offsetof(struct ptlrpc_body_v2, pb_handle));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_handle), "%d != %d\n",
@@ -810,3392 +822,3529 @@ void lustre_assert_wire_constants(void)
                 (int)offsetof(struct ptlrpc_body_v3, pb_padding), (int)offsetof(struct ptlrpc_body_v2, pb_padding));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding), "%d != %d\n",
                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding));
-        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);
+       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",
-                 (long long)(int)sizeof(struct obd_connect_data));
-        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",
-                 (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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_version));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_grant));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_index));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_blocksize) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_blocksize));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_inodespace) == 33, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_inodespace));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_grant_extent) == 34, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_grant_extent));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_unused) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_unused));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_unused) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_unused));
-        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",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_transno));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_instance));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, padding1));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, padding2));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding3) == 88, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding3));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding3));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding4) == 96, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding4));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding4) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding4));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding5) == 104, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding5));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding5) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding5));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding6) == 112, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding6));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding6) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding6));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding7) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding7));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding7) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding7));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding8) == 128, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding8));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding8) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding8));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding9) == 136, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding9));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding9) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding9));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingA) == 144, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingA));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingA) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingA));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingB) == 152, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingB));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingB) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingB));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingC) == 160, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingC));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingC) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingC));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingD) == 168, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingD));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingD) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingD));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingE) == 176, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingE));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingE) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingE));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingF) == 184, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingF));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingF) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingF));
-        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_CONNECT_JOBSTATS == 0x20000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_JOBSTATS);
-        LASSERTF(OBD_CONNECT_UMASK == 0x40000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_UMASK);
-        LASSERTF(OBD_CONNECT_EINPROGRESS == 0x80000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_EINPROGRESS);
-        LASSERTF(OBD_CONNECT_GRANT_PARAM == 0x100000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_GRANT_PARAM);
-        LASSERTF(OBD_CONNECT_FLOCK_OWNER == 0x200000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_FLOCK_OWNER);
-        LASSERTF(OBD_CONNECT_LVB_TYPE == 0x400000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_LVB_TYPE);
-        LASSERTF(OBD_CONNECT_NANOSEC_TIME == 0x800000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_NANOSEC_TIME);
-        LASSERTF(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_LIGHTWEIGHT);
-        LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_SHORTIO);
-        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 obd_connect_data */
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_version));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_grant));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_index));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_blocksize) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_blocksize));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_inodespace) == 33, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_inodespace));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_grant_extent) == 34, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_grant_extent));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_unused) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_unused));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_unused) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_unused));
+       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",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_transno));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_instance));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, padding1));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, padding2));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding3) == 88, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding3));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding3));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding4) == 96, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding4));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding4) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding4));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding5) == 104, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding5));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding5) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding5));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding6) == 112, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding6));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding6) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding6));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding7) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding7));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding7) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding7));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding8) == 128, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding8));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding8) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding8));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding9) == 136, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding9));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding9) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding9));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingA) == 144, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingA));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingA) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingA));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingB) == 152, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingB));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingB) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingB));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingC) == 160, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingC));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingC) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingC));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingD) == 168, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingD));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingD) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingD));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingE) == 176, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingE));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingE) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingE));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingF) == 184, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingF));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingF) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingF));
+       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_CONNECT_JOBSTATS == 0x20000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_JOBSTATS);
+       LASSERTF(OBD_CONNECT_UMASK == 0x40000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_UMASK);
+       LASSERTF(OBD_CONNECT_EINPROGRESS == 0x80000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_EINPROGRESS);
+       LASSERTF(OBD_CONNECT_GRANT_PARAM == 0x100000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_GRANT_PARAM);
+       LASSERTF(OBD_CONNECT_FLOCK_OWNER == 0x200000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_FLOCK_OWNER);
+       LASSERTF(OBD_CONNECT_LVB_TYPE == 0x400000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_LVB_TYPE);
+       LASSERTF(OBD_CONNECT_NANOSEC_TIME == 0x800000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_NANOSEC_TIME);
+       LASSERTF(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_LIGHTWEIGHT);
+       LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_SHORTIO);
+       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",
-                 (long long)(int)sizeof(struct obdo));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_valid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_id));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_seq));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_parent_seq));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_size));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_mtime));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_atime));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_ctime));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_blocks));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_grant));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_blksize));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_mode));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_uid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_gid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_flags));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_nlink));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_parent_oid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_misc));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_ioepoch));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_stripe_idx));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_parent_ver));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_handle));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_lcookie));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_uid_h));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_gid_h));
-        LASSERTF((int)offsetof(struct obdo, o_data_version) == 176, "found %lld\n",
-                 (long long)(int)offsetof(struct obdo, o_data_version));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_data_version) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_data_version));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_padding_4));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_padding_5));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_padding_6));
-        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_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);
-        LASSERTF(OBD_MD_FLDATAVERSION == (0x0010000000000000ULL), "found 0x%.16llxULL\n",
-                 OBD_MD_FLDATAVERSION);
-        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 obdo */
+       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",
+                (long long)(int)offsetof(struct obdo, o_valid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_oi.oi_id));
+       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",
+                (long long)(int)offsetof(struct obdo, o_oi.oi_seq));
+       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",
+                (long long)(int)offsetof(struct obdo, o_parent_seq));
+       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",
+                (long long)(int)offsetof(struct obdo, o_size));
+       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",
+                (long long)(int)offsetof(struct obdo, o_mtime));
+       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",
+                (long long)(int)offsetof(struct obdo, o_atime));
+       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",
+                (long long)(int)offsetof(struct obdo, o_ctime));
+       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",
+                (long long)(int)offsetof(struct obdo, o_blocks));
+       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",
+                (long long)(int)offsetof(struct obdo, o_grant));
+       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",
+                (long long)(int)offsetof(struct obdo, o_blksize));
+       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",
+                (long long)(int)offsetof(struct obdo, o_mode));
+       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",
+                (long long)(int)offsetof(struct obdo, o_uid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_gid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_flags));
+       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",
+                (long long)(int)offsetof(struct obdo, o_nlink));
+       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",
+                (long long)(int)offsetof(struct obdo, o_parent_oid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_misc));
+       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",
+                (long long)(int)offsetof(struct obdo, o_ioepoch));
+       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",
+                (long long)(int)offsetof(struct obdo, o_stripe_idx));
+       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",
+                (long long)(int)offsetof(struct obdo, o_parent_ver));
+       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",
+                (long long)(int)offsetof(struct obdo, o_handle));
+       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",
+                (long long)(int)offsetof(struct obdo, o_lcookie));
+       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",
+                (long long)(int)offsetof(struct obdo, o_uid_h));
+       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",
+                (long long)(int)offsetof(struct obdo, o_gid_h));
+       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_data_version) == 176, "found %lld\n",
+                (long long)(int)offsetof(struct obdo, o_data_version));
+       LASSERTF((int)sizeof(((struct obdo *)0)->o_data_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obdo *)0)->o_data_version));
+       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",
+                (long long)(int)sizeof(((struct obdo *)0)->o_padding_4));
+       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",
+                (long long)(int)sizeof(((struct obdo *)0)->o_padding_5));
+       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",
+                (long long)(int)sizeof(((struct obdo *)0)->o_padding_6));
+       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_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);
+       LASSERTF(OBD_MD_FLDATAVERSION == (0x0010000000000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLDATAVERSION);
+       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_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",
-                 (long long)(int)sizeof(struct lov_mds_md_v1));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct lov_mds_md_v1, lmm_stripe_count));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
-                 (long long)(int)offsetof(struct lov_mds_md_v1, lmm_layout_gen));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen));
-        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);
+       /* Checks for struct lov_mds_md_v1 */
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct lov_mds_md_v1, lmm_stripe_count));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
+                (long long)(int)offsetof(struct lov_mds_md_v1, lmm_layout_gen));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen));
+       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);
 
-        /* Checks for struct lov_mds_md_v3 */
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_stripe_count));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
-                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_layout_gen));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen));
-        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 == 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 lov_mds_md_v3 */
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct lov_mds_md_v3, lmm_stripe_count));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
+                (long long)(int)offsetof(struct lov_mds_md_v3, lmm_layout_gen));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen));
+       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 == 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",
-                 (long long)(int)sizeof(struct obd_statfs));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_type));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_blocks));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_bfree));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_bavail));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_ffree));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_fsid));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_bsize));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_namelen));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_state));
-        LASSERTF((int)offsetof(struct obd_statfs, os_fprecreated) == 108, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_statfs, os_fprecreated));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_fprecreated) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_fprecreated));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare2));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare3));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare4));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare5));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare6));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare7));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare8));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare9));
+       /* Checks for struct obd_statfs */
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_type));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_blocks));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_bfree));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_bavail));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_ffree));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_fsid));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_bsize));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_namelen));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_state));
+       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_fprecreated) == 108, "found %lld\n",
+                (long long)(int)offsetof(struct obd_statfs, os_fprecreated));
+       LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_fprecreated) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_fprecreated));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare2));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare3));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare4));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare5));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare6));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare7));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare8));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct obd_ioobj));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_id));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_seq));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_type));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt));
+       /* Checks for struct obd_ioobj */
+       LASSERTF((int)sizeof(struct obd_ioobj) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct obd_ioobj));
+       LASSERTF((int)offsetof(struct obd_ioobj, ioo_oid.oi_id) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct obd_ioobj, ioo_oid.oi_id));
+       LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_id) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_id));
+       LASSERTF((int)offsetof(struct obd_ioobj, ioo_oid.oi_seq) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct obd_ioobj, ioo_oid.oi_seq));
+       LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_seq) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_seq));
+       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",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_type));
+       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",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt));
 
-        /* Checks for union lquota_id */
-        LASSERTF((int)sizeof(union lquota_id) == 16, "found %lld\n",
-                 (long long)(int)sizeof(union lquota_id));
+       /* Checks for union lquota_id */
+       LASSERTF((int)sizeof(union lquota_id) == 16, "found %lld\n",
+                (long long)(int)sizeof(union lquota_id));
 
-        LASSERTF(QUOTABLOCK_BITS == 10, "found %lld\n",
-                 (long long)QUOTABLOCK_BITS);
-        LASSERTF(QUOTABLOCK_SIZE == 1024, "found %lld\n",
-                 (long long)QUOTABLOCK_SIZE);
+       LASSERTF(QUOTABLOCK_BITS == 10, "found %lld\n",
+                (long long)QUOTABLOCK_BITS);
+       LASSERTF(QUOTABLOCK_SIZE == 1024, "found %lld\n",
+                (long long)QUOTABLOCK_SIZE);
 
-        /* Checks for struct obd_quotactl */
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_cmd));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_type));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_id));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_stat));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_dqinfo));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_dqblk));
-        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_quotactl */
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_cmd));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_type));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_id));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_stat));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_dqinfo));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_dqblk));
+       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",
-                 (long long)(int)sizeof(struct obd_dqinfo));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_bgrace));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_igrace));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_flags));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_valid));
+       /* Checks for struct obd_dqinfo */
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_bgrace));
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_igrace));
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_flags));
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_valid));
+       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",
-                 (long long)(int)sizeof(struct obd_dqblk));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bhardlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bsoftlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curspace));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_ihardlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_isoftlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curinodes));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_btime));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_itime));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_valid));
-        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 obd_dqblk */
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_bhardlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_bsoftlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_curspace));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_ihardlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_isoftlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_curinodes));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_btime));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_itime));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_valid));
+       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, 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 lquota_acct_rec */
-        LASSERTF((int)sizeof(struct lquota_acct_rec) == 16, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_acct_rec));
-        LASSERTF((int)offsetof(struct lquota_acct_rec, bspace) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_acct_rec, bspace));
-        LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->bspace) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_acct_rec *)0)->bspace));
-        LASSERTF((int)offsetof(struct lquota_acct_rec, ispace) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_acct_rec, ispace));
-        LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->ispace) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_acct_rec *)0)->ispace));
+       /* Checks for struct lquota_acct_rec */
+       LASSERTF((int)sizeof(struct lquota_acct_rec) == 16, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_acct_rec));
+       LASSERTF((int)offsetof(struct lquota_acct_rec, bspace) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_acct_rec, bspace));
+       LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->bspace) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_acct_rec *)0)->bspace));
+       LASSERTF((int)offsetof(struct lquota_acct_rec, ispace) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_acct_rec, ispace));
+       LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->ispace) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_acct_rec *)0)->ispace));
 
-        /* Checks for struct lquota_glb_rec */
-        LASSERTF((int)sizeof(struct lquota_glb_rec) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_glb_rec));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_hardlimit) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_hardlimit));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_softlimit) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_softlimit));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_time) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_time));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_time) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_time));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_granted) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_granted));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted));
+       /* Checks for struct lquota_glb_rec */
+       LASSERTF((int)sizeof(struct lquota_glb_rec) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_glb_rec));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_hardlimit) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_hardlimit));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_softlimit) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_softlimit));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_time) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_time));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_time) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_time));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_granted) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_granted));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted));
 
-        /* Checks for struct lquota_slv_rec */
-        LASSERTF((int)sizeof(struct lquota_slv_rec) == 8, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_slv_rec));
-        LASSERTF((int)offsetof(struct lquota_slv_rec, qsr_granted) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_slv_rec, qsr_granted));
-        LASSERTF((int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted));
+       /* Checks for struct lquota_slv_rec */
+       LASSERTF((int)sizeof(struct lquota_slv_rec) == 8, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_slv_rec));
+       LASSERTF((int)offsetof(struct lquota_slv_rec, qsr_granted) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_slv_rec, qsr_granted));
+       LASSERTF((int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted));
 
-        /* Checks for struct idx_info */
-        LASSERTF((int)sizeof(struct idx_info) == 80, "found %lld\n",
-                 (long long)(int)sizeof(struct idx_info));
-        LASSERTF((int)offsetof(struct idx_info, ii_magic) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_magic));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_magic) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_magic));
-        LASSERTF((int)offsetof(struct idx_info, ii_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_flags));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_flags));
-        LASSERTF((int)offsetof(struct idx_info, ii_count) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_count));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_count) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_count));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad0) == 10, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad0));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad0) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad0));
-        LASSERTF((int)offsetof(struct idx_info, ii_attrs) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_attrs));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_attrs) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_attrs));
-        LASSERTF((int)offsetof(struct idx_info, ii_fid) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_fid));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_fid));
-        LASSERTF((int)offsetof(struct idx_info, ii_version) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_version));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_version) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_version));
-        LASSERTF((int)offsetof(struct idx_info, ii_hash_start) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_hash_start));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_start) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_start));
-        LASSERTF((int)offsetof(struct idx_info, ii_hash_end) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_hash_end));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_end) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_end));
-        LASSERTF((int)offsetof(struct idx_info, ii_keysize) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_keysize));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_keysize) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_keysize));
-        LASSERTF((int)offsetof(struct idx_info, ii_recsize) == 58, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_recsize));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_recsize) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_recsize));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad1) == 60, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad1));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad1));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad2) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad2));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad2));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad3) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad3));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad3));
-        CLASSERT(IDX_INFO_MAGIC == 0x3D37CC37);
+       /* Checks for struct idx_info */
+       LASSERTF((int)sizeof(struct idx_info) == 80, "found %lld\n",
+                (long long)(int)sizeof(struct idx_info));
+       LASSERTF((int)offsetof(struct idx_info, ii_magic) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_magic));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_magic) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_magic));
+       LASSERTF((int)offsetof(struct idx_info, ii_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_flags));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_flags));
+       LASSERTF((int)offsetof(struct idx_info, ii_count) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_count));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_count) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_count));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad0) == 10, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad0));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad0) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad0));
+       LASSERTF((int)offsetof(struct idx_info, ii_attrs) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_attrs));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_attrs) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_attrs));
+       LASSERTF((int)offsetof(struct idx_info, ii_fid) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_fid));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_fid));
+       LASSERTF((int)offsetof(struct idx_info, ii_version) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_version));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_version));
+       LASSERTF((int)offsetof(struct idx_info, ii_hash_start) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_hash_start));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_start) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_start));
+       LASSERTF((int)offsetof(struct idx_info, ii_hash_end) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_hash_end));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_end) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_end));
+       LASSERTF((int)offsetof(struct idx_info, ii_keysize) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_keysize));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_keysize) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_keysize));
+       LASSERTF((int)offsetof(struct idx_info, ii_recsize) == 58, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_recsize));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_recsize) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_recsize));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad1) == 60, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad1));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad1));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad2) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad2));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad2));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad3) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad3));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad3));
+       CLASSERT(IDX_INFO_MAGIC == 0x3D37CC37);
 
-        /* Checks for struct lu_idxpage */
-        LASSERTF((int)sizeof(struct lu_idxpage) == 16, "found %lld\n",
-                 (long long)(int)sizeof(struct lu_idxpage));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_magic) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_magic));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_magic) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_magic));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_flags));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_flags) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_flags));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_nr) == 6, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_nr));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_nr) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_nr));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_pad0) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_pad0));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_pad0) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_pad0));
-        CLASSERT(LIP_MAGIC == 0x8A6D6B6C);
-        LASSERTF(LIP_HDR_SIZE == 16, "found %lld\n",
-                 (long long)LIP_HDR_SIZE);
-        LASSERTF(II_FL_NOHASH == 1, "found %lld\n",
-                 (long long)II_FL_NOHASH);
-        LASSERTF(II_FL_VARKEY == 2, "found %lld\n",
-                 (long long)II_FL_VARKEY);
-        LASSERTF(II_FL_VARREC == 4, "found %lld\n",
-                 (long long)II_FL_VARREC);
-        LASSERTF(II_FL_NONUNQ == 8, "found %lld\n",
-                 (long long)II_FL_NONUNQ);
+       /* Checks for struct lu_idxpage */
+       LASSERTF((int)sizeof(struct lu_idxpage) == 16, "found %lld\n",
+                (long long)(int)sizeof(struct lu_idxpage));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_magic) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_magic));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_magic) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_magic));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_flags));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_flags));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_nr) == 6, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_nr));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_nr) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_nr));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_pad0) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_pad0));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_pad0) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_pad0));
+       CLASSERT(LIP_MAGIC == 0x8A6D6B6C);
+       LASSERTF(LIP_HDR_SIZE == 16, "found %lld\n",
+                (long long)LIP_HDR_SIZE);
+       LASSERTF(II_FL_NOHASH == 1, "found %lld\n",
+                (long long)II_FL_NOHASH);
+       LASSERTF(II_FL_VARKEY == 2, "found %lld\n",
+                (long long)II_FL_VARKEY);
+       LASSERTF(II_FL_VARREC == 4, "found %lld\n",
+                (long long)II_FL_VARREC);
+       LASSERTF(II_FL_NONUNQ == 8, "found %lld\n",
+                (long long)II_FL_NONUNQ);
 
-        /* Checks for struct niobuf_remote */
-        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",
-                 (long long)(int)offsetof(struct niobuf_remote, offset));
-        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",
-                 (long long)(int)offsetof(struct niobuf_remote, len));
-        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",
-                 (long long)(int)offsetof(struct niobuf_remote, flags));
-        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 == 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 niobuf_remote */
+       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",
+                (long long)(int)offsetof(struct niobuf_remote, offset));
+       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",
+                (long long)(int)offsetof(struct niobuf_remote, len));
+       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",
+                (long long)(int)offsetof(struct niobuf_remote, flags));
+       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 == 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",
-                 (long long)(int)sizeof(struct ost_body));
-        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",
-                 (long long)(int)sizeof(((struct ost_body *)0)->oa));
+       /* Checks for struct ost_body */
+       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",
+                (long long)(int)offsetof(struct ost_body, oa));
+       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",
-                 (long long)(int)sizeof(struct ll_fid));
-        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",
-                 (long long)(int)sizeof(((struct ll_fid *)0)->id));
-        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",
-                 (long long)(int)sizeof(((struct ll_fid *)0)->generation));
-        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",
-                 (long long)(int)sizeof(((struct ll_fid *)0)->f_type));
+       /* Checks for struct ll_fid */
+       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",
+                (long long)(int)offsetof(struct ll_fid, id));
+       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",
+                (long long)(int)offsetof(struct ll_fid, generation));
+       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",
+                (long long)(int)offsetof(struct ll_fid, f_type));
+       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 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_BY_FID == 000040000000UL, "found 0%.11oUL\n",
-                 MDS_OPEN_BY_FID);
-        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_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_OPEN_VOLATILE == 00000000000400000000000ULL, "found 0%.22lloULL\n",
-                 (long long)MDS_OPEN_VOLATILE);
-        LASSERTF(LUSTRE_SYNC_FL == 0x00000008, "found 0x%.8x\n",
-                 LUSTRE_SYNC_FL);
-        LASSERTF(LUSTRE_IMMUTABLE_FL == 0x00000010, "found 0x%.8x\n",
-                 LUSTRE_IMMUTABLE_FL);
-        LASSERTF(LUSTRE_APPEND_FL == 0x00000020, "found 0x%.8x\n",
-                 LUSTRE_APPEND_FL);
-        LASSERTF(LUSTRE_NOATIME_FL == 0x00000080, "found 0x%.8x\n",
-                 LUSTRE_NOATIME_FL);
-        LASSERTF(LUSTRE_DIRSYNC_FL == 0x00010000, "found 0x%.8x\n",
-                 LUSTRE_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);
-        LASSERTF(MDS_INODELOCK_LAYOUT == 0x000008, "found 0x%.8x\n",
-                 MDS_INODELOCK_LAYOUT);
+       /* 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_BY_FID == 000040000000UL, "found 0%.11oUL\n",
+               MDS_OPEN_BY_FID);
+       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_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_OPEN_VOLATILE == 00000000000400000000000ULL, "found 0%.22lloULL\n",
+                       (long long)MDS_OPEN_VOLATILE);
+       LASSERTF(LUSTRE_SYNC_FL == 0x00000008, "found 0x%.8x\n",
+               LUSTRE_SYNC_FL);
+       LASSERTF(LUSTRE_IMMUTABLE_FL == 0x00000010, "found 0x%.8x\n",
+               LUSTRE_IMMUTABLE_FL);
+       LASSERTF(LUSTRE_APPEND_FL == 0x00000020, "found 0x%.8x\n",
+               LUSTRE_APPEND_FL);
+       LASSERTF(LUSTRE_NOATIME_FL == 0x00000080, "found 0x%.8x\n",
+               LUSTRE_NOATIME_FL);
+       LASSERTF(LUSTRE_DIRSYNC_FL == 0x00010000, "found 0x%.8x\n",
+               LUSTRE_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);
+       LASSERTF(MDS_INODELOCK_LAYOUT == 0x000008, "found 0x%.8x\n",
+               MDS_INODELOCK_LAYOUT);
 
-        /* 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_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_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",
-                 (long long)(int)sizeof(struct mdt_rec_setattr));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_suppgid));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_fid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_valid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_uid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_gid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_size));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_blocks));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_mtime));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_atime));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_ctime));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_mode));
-        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_bias) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_bias));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_5));
+       /* Checks for struct mdt_rec_setattr */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_suppgid));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_fid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_valid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_uid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_gid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_size));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_blocks));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_mtime));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_atime));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_ctime));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_mode));
+       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_bias) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_bias));
+       LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_create));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_fid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_time));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_rdev));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_ioepoch));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_mode));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_bias));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_flags_h));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_umask) == 128, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_umask));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_umask) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_umask));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_padding_4));
+       /* Checks for struct mdt_rec_create */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_time));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_rdev));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_ioepoch));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_mode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_bias));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_flags_h));
+       LASSERTF((int)offsetof(struct mdt_rec_create, cr_umask) == 128, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_umask));
+       LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_umask) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_umask));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_link));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_fid2));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_time));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_bias));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_9));
+       /* Checks for struct mdt_rec_link */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fid2));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_time));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_bias));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_unlink));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid2));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_time));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_bias));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_mode));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_9));
+       /* Checks for struct mdt_rec_unlink */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid2));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_time));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_bias));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_mode));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_rename));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_fid2));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_time));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_bias));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_mode));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_8));
+       /* Checks for struct mdt_rec_rename */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fid2));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_time));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_bias));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_mode));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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_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 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_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 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",
-                 (long long)(int)sizeof(struct lov_desc));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_count));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_pattern));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_qos_maxage));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_1));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_2));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_uuid));
-        CLASSERT(LOV_DESC_MAGIC == 0xB0CCDE5C);
+       /* Checks for struct lov_desc */
+       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",
+                (long long)(int)offsetof(struct lov_desc, ld_tgt_count));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_count));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_pattern));
+       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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_qos_maxage));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_1));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_2));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct ldlm_res_id));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_res_id *)0)->name[4]));
+       /* Checks for struct ldlm_res_id */
+       LASSERTF((int)sizeof(struct ldlm_res_id) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct ldlm_res_id));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct ldlm_extent));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_extent *)0)->start));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_extent *)0)->end));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_extent *)0)->gid));
+       /* Checks for struct ldlm_extent */
+       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",
+                (long long)(int)offsetof(struct ldlm_extent, start));
+       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",
+                (long long)(int)offsetof(struct ldlm_extent, end));
+       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",
+                (long long)(int)offsetof(struct ldlm_extent, gid));
+       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_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",
-                 (long long)(int)sizeof(struct ldlm_flock_wire));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_start));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_end));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_owner));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_pid));
+       /* Checks for struct ldlm_flock_wire */
+       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",
+                (long long)(int)offsetof(struct ldlm_flock_wire, lfw_start));
+       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",
+                (long long)(int)offsetof(struct ldlm_flock_wire, lfw_end));
+       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",
+                (long long)(int)offsetof(struct ldlm_flock_wire, lfw_owner));
+       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_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",
+                (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_pid));
 
-        /* Checks for struct ldlm_intent */
-        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",
-                 (long long)(int)offsetof(struct ldlm_intent, opc));
-        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_intent */
+       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",
+                (long long)(int)offsetof(struct ldlm_intent, opc));
+       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",
-                 (long long)(int)sizeof(struct ldlm_resource_desc));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_type));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_padding));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_name));
+       /* Checks for struct ldlm_resource_desc */
+       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",
+                (long long)(int)offsetof(struct ldlm_resource_desc, lr_type));
+       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",
+                (long long)(int)offsetof(struct ldlm_resource_desc, lr_padding));
+       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",
+                (long long)(int)offsetof(struct ldlm_resource_desc, lr_name));
+       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",
-                 (long long)(int)sizeof(struct ldlm_lock_desc));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data));
+       /* Checks for struct ldlm_lock_desc */
+       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",
+                (long long)(int)offsetof(struct ldlm_lock_desc, l_resource));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct ldlm_request));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_flags));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_count));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_desc));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle));
+       /* Checks for struct ldlm_request */
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_flags));
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_count));
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_desc));
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_handle));
+       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",
-                 (long long)(int)sizeof(struct ldlm_reply));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_flags));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_padding));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_desc));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_handle));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2));
+       /* Checks for struct ldlm_reply */
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_flags));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_padding));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_desc));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_handle));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_policy_res1));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_policy_res2));
+       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_v1 */
-        LASSERTF((int)sizeof(struct ost_lvb_v1) == 40, "found %lld\n",
-                 (long long)(int)sizeof(struct ost_lvb_v1));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_size) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_size));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_mtime) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_mtime));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_atime) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_atime));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_ctime) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_ctime));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_blocks) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_blocks));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks));
+       /* Checks for struct ost_lvb_v1 */
+       LASSERTF((int)sizeof(struct ost_lvb_v1) == 40, "found %lld\n",
+                (long long)(int)sizeof(struct ost_lvb_v1));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_size) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_size));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_mtime) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_mtime));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_atime) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_atime));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_ctime) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_ctime));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_blocks) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_blocks));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks));
 
-        /* Checks for struct ost_lvb */
-        LASSERTF((int)sizeof(struct ost_lvb) == 56, "found %lld\n",
-                 (long long)(int)sizeof(struct ost_lvb));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_size));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_mtime_ns) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_mtime_ns));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_atime_ns) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_atime_ns));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_ctime_ns) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_ctime_ns));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_padding) == 52, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_padding));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_padding));
+       /* Checks for struct ost_lvb */
+       LASSERTF((int)sizeof(struct ost_lvb) == 56, "found %lld\n",
+                (long long)(int)sizeof(struct ost_lvb));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_size));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_mtime_ns) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_mtime_ns));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_atime_ns) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_atime_ns));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_ctime_ns) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_ctime_ns));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_padding) == 52, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_padding));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_padding));
 
-        /* Checks for struct lquota_lvb */
-        LASSERTF((int)sizeof(struct lquota_lvb) == 40, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_lvb));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_flags) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_flags));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_flags) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_flags));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_may_rel) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_may_rel));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_rel) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_rel));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_qunit) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_qunit));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_pad1) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_pad1));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_pad1) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_pad1));
-        LASSERTF(LQUOTA_FL_EDQUOT == 1, "found %lld\n",
-                 (long long)LQUOTA_FL_EDQUOT);
+       /* Checks for struct lquota_lvb */
+       LASSERTF((int)sizeof(struct lquota_lvb) == 40, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_lvb));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_flags) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_flags));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_flags) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_flags));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_may_rel) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_id_may_rel));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_rel) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_id_rel));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_qunit) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_id_qunit));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_pad1) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_pad1));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_pad1) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_pad1));
+       LASSERTF(LQUOTA_FL_EDQUOT == 1, "found %lld\n",
+                (long long)LQUOTA_FL_EDQUOT);
 
-        /* Checks for struct ldlm_gl_lquota_desc */
-        LASSERTF((int)sizeof(struct ldlm_gl_lquota_desc) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct ldlm_gl_lquota_desc));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_id) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_id));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_flags) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_flags));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_ver) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_ver));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_time) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_time));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2));
+       /* Checks for struct ldlm_gl_lquota_desc */
+       LASSERTF((int)sizeof(struct ldlm_gl_lquota_desc) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct ldlm_gl_lquota_desc));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_id) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_id));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_flags) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_flags));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_ver) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_ver));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_time) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_time));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2));
 
-        /* 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 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",
-                 (long long)(int)sizeof(struct cfg_marker));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_step));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_flags));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_vers));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_createtime));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_canceltime));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_tgtname));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_comment));
+       /* Checks for struct cfg_marker */
+       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",
+                (long long)(int)offsetof(struct cfg_marker, cm_step));
+       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",
+                (long long)(int)offsetof(struct cfg_marker, cm_flags));
+       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",
+                (long long)(int)offsetof(struct cfg_marker, cm_vers));
+       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_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",
+                (long long)(int)sizeof(((struct cfg_marker *)0)->cm_createtime));
+       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",
+                (long long)(int)sizeof(((struct cfg_marker *)0)->cm_canceltime));
+       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",
+                (long long)(int)sizeof(((struct cfg_marker *)0)->cm_tgtname));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct llog_logid));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid *)0)->lgl_oid));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid *)0)->lgl_oseq));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid *)0)->lgl_ogen));
-        CLASSERT(OST_SZ_REC == 274730752);
-        CLASSERT(MDS_UNLINK_REC == 274801668);
-        CLASSERT(MDS_UNLINK64_REC == 275325956);
-        CLASSERT(MDS_SETATTR64_REC == 275325953);
-        CLASSERT(OBD_CFG_REC == 274857984);
-        CLASSERT(LLOG_GEN_REC == 274989056);
-        CLASSERT(CHANGELOG_REC == 275120128);
-        CLASSERT(CHANGELOG_USER_REC == 275185664);
-        CLASSERT(LLOG_HDR_MAGIC == 275010873);
-        CLASSERT(LLOG_LOGID_MAGIC == 275010875);
+       /* Checks for struct llog_logid */
+       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",
+                (long long)(int)offsetof(struct llog_logid, lgl_oid));
+       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",
+                (long long)(int)offsetof(struct llog_logid, lgl_oseq));
+       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",
+                (long long)(int)offsetof(struct llog_logid, lgl_ogen));
+       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(MDS_UNLINK_REC == 274801668);
+       CLASSERT(MDS_UNLINK64_REC == 275325956);
+       CLASSERT(MDS_SETATTR64_REC == 275325953);
+       CLASSERT(OBD_CFG_REC == 274857984);
+       CLASSERT(LLOG_GEN_REC == 274989056);
+       CLASSERT(CHANGELOG_REC == 275120128);
+       CLASSERT(CHANGELOG_USER_REC == 275185664);
+       CLASSERT(LLOG_HDR_MAGIC == 275010873);
+       CLASSERT(LLOG_LOGID_MAGIC == 275010875);
 
-        /* Checks for struct llog_catid */
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_logid));
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_padding1));
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_padding2));
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_padding3));
-        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_catid */
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_logid));
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_padding1));
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_padding2));
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_padding3));
+       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",
-                 (long long)(int)sizeof(struct llog_rec_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_len));
-        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",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_index));
-        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",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_type));
-        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_id) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_rec_hdr, lrh_id));
-        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_id) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_id));
+       /* Checks for struct llog_rec_hdr */
+       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",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_len));
+       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",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_index));
+       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",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_type));
+       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, lrh_id) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_id));
+       LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_id) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_id));
 
-        /* Checks for struct llog_rec_tail */
-        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",
-                 (long long)(int)offsetof(struct llog_rec_tail, lrt_len));
-        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",
-                 (long long)(int)offsetof(struct llog_rec_tail, lrt_index));
-        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_rec_tail */
+       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",
+                (long long)(int)offsetof(struct llog_rec_tail, lrt_len));
+       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",
+                (long long)(int)offsetof(struct llog_rec_tail, lrt_index));
+       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",
-                 (long long)(int)sizeof(struct llog_logid_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_id));
-        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) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding2));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding3) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding3));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding3));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_tail));
+       /* Checks for struct llog_logid_rec */
+       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",
+                (long long)(int)offsetof(struct llog_logid_rec, lid_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_logid_rec, lid_id));
+       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, 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) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding2));
+       LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding3) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_logid_rec, lid_padding3));
+       LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding3));
+       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",
+                (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_tail));
 
-        /* Checks for struct llog_unlink_rec */
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_hdr));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_oid));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_oseq));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_count));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_tail));
-        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_unlink64_rec */
-        LASSERTF((int)sizeof(struct llog_unlink64_rec) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_unlink64_rec));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_hdr) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_hdr));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_fid) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_fid));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_count) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_count));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_count) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_count));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_tail) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_tail));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding1) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding1));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding2) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding2));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding3) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding3));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3));
+       /* Checks for struct llog_unlink_rec */
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_oid));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_oseq));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_count));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_tail));
+       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_unlink64_rec */
+       LASSERTF((int)sizeof(struct llog_unlink64_rec) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct llog_unlink64_rec));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_hdr) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_hdr));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_fid) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_fid));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_count) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_count));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_count));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_tail) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_tail));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding1) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding1));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding2) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding2));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding3) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding3));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3));
 
-        /* Checks for struct llog_setattr64_rec */
-        LASSERTF((int)sizeof(struct llog_setattr64_rec) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_setattr64_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid));
-        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) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_gid));
-        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",
-                 (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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_padding) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_padding));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 56, "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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail));
+       /* Checks for struct llog_setattr64_rec */
+       LASSERTF((int)sizeof(struct llog_setattr64_rec) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct llog_setattr64_rec));
+       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",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr));
+       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",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid));
+       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) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct llog_setattr64_rec, lsr_gid));
+       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",
+                (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",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_padding) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_setattr64_rec, lsr_padding));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 56, "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",
+                (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) == 64, "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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding1) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding1));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding2) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding2));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding3) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding3));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 56, "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",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_tail));
+       /* Checks for struct llog_size_change_rec */
+       LASSERTF((int)sizeof(struct llog_size_change_rec) == 64, "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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding1) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding1));
+       LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding2) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding2));
+       LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding3) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding3));
+       LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 56, "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",
+                (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",
-                 (long long)(int)sizeof(struct changelog_rec));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_namelen));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_flags));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_type));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_index));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_prev));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_time));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_tfid));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_pfid));
+       /* Checks for struct changelog_rec */
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_namelen));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_flags));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_type));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_index));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_prev));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_time));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_tfid));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_pfid));
+       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_ext_rec */
-        LASSERTF((int)sizeof(struct changelog_ext_rec) == 96, "found %lld\n",
-                 (long long)(int)sizeof(struct changelog_ext_rec));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_namelen) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_namelen));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_flags) == 2, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_flags));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_flags) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_flags));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_type) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_type));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_type) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_type));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_index) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_index));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_index) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_index));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_prev) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_prev));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_prev) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_prev));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_time) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_time));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_time) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_time));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_tfid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_tfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_pfid) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_pfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_sfid) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_sfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_spfid) == 80, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_spfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid));
+       /* Checks for struct changelog_ext_rec */
+       LASSERTF((int)sizeof(struct changelog_ext_rec) == 96, "found %lld\n",
+                (long long)(int)sizeof(struct changelog_ext_rec));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_namelen) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_namelen));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_flags) == 2, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_flags));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_flags));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_type) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_type));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_type) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_type));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_index) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_index));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_index) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_index));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_prev) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_prev));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_prev) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_prev));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_time) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_time));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_time) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_time));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_tfid) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_tfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_pfid) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_pfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_sfid) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_sfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_spfid) == 80, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_spfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid));
 
-        /* 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 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",
-                 (long long)(int)sizeof(struct llog_changelog_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr));
-        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",
-                 (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_tail));
+       /* Checks for struct llog_changelog_rec */
+       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",
+                (long long)(int)offsetof(struct llog_changelog_rec, cr_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_changelog_rec, cr));
+       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",
+                (long long)(int)offsetof(struct llog_changelog_rec, cr_tail));
+       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_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",
-                 (long long)(int)sizeof(struct llog_gen));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen *)0)->mnt_cnt));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen *)0)->conn_cnt));
+       /* Checks for struct llog_gen */
+       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",
+                (long long)(int)offsetof(struct llog_gen, mnt_cnt));
+       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",
+                (long long)(int)offsetof(struct llog_gen, conn_cnt));
+       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) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_gen_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_gen));
-        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 56, "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",
-                 (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_tail));
+       /* Checks for struct llog_gen_rec */
+       LASSERTF((int)sizeof(struct llog_gen_rec) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct llog_gen_rec));
+       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",
+                (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_hdr));
+       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",
+                (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_gen));
+       LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 56, "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",
+                (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",
-                 (long long)(int)sizeof(struct llog_log_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_timestamp));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_size));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_flags));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_tgtuuid));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_reserved));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_bitmap));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_tail));
-        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_log_hdr */
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_timestamp));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_count));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_size));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_flags));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_tgtuuid));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_reserved));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_bitmap));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_tail));
+       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",
-                 (long long)(int)sizeof(struct llog_cookie));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_lgl));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_subsys));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_index));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_padding));
+       /* Checks for struct llog_cookie */
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_lgl));
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_subsys));
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_index));
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_padding));
+       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",
-                 (long long)(int)sizeof(struct llogd_body));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_logid));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_ctxt_idx));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_llh_flags));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_index));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_saved_index));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_len));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_cur_offset));
-        CLASSERT(LLOG_ORIGIN_HANDLE_CREATE == 501);
-        CLASSERT(LLOG_ORIGIN_HANDLE_NEXT_BLOCK == 502);
-        CLASSERT(LLOG_ORIGIN_HANDLE_READ_HEADER == 503);
-        CLASSERT(LLOG_ORIGIN_HANDLE_WRITE_REC == 504);
-        CLASSERT(LLOG_ORIGIN_HANDLE_CLOSE == 505);
-        CLASSERT(LLOG_ORIGIN_CONNECT == 506);
-        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_body */
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_logid));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_ctxt_idx));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_llh_flags));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_index));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_saved_index));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_len));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_cur_offset));
+       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);
+       CLASSERT(LLOG_ORIGIN_HANDLE_READ_HEADER == 503);
+       CLASSERT(LLOG_ORIGIN_HANDLE_WRITE_REC == 504);
+       CLASSERT(LLOG_ORIGIN_HANDLE_CLOSE == 505);
+       CLASSERT(LLOG_ORIGIN_CONNECT == 506);
+       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",
-                 (long long)(int)sizeof(struct llogd_conn_body));
-        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",
-                 (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_gen));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
+       /* Checks for struct llogd_conn_body */
+       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",
+                (long long)(int)offsetof(struct llogd_conn_body, lgdc_gen));
+       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",
+                (long long)(int)offsetof(struct llogd_conn_body, lgdc_logid));
+       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",
+                (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",
+                (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 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 quota_body */
-        LASSERTF((int)sizeof(struct quota_body) == 112, "found %lld\n",
-                 (long long)(int)sizeof(struct quota_body));
-        LASSERTF((int)offsetof(struct quota_body, qb_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_fid));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_fid));
-        LASSERTF((int)offsetof(struct quota_body, qb_id) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_id));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_id) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_id));
-        LASSERTF((int)offsetof(struct quota_body, qb_flags) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_flags));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_flags));
-        LASSERTF((int)offsetof(struct quota_body, qb_padding) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_padding));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_padding));
-        LASSERTF((int)offsetof(struct quota_body, qb_count) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_count));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_count) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_count));
-        LASSERTF((int)offsetof(struct quota_body, qb_usage) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_usage));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_usage) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_usage));
-        LASSERTF((int)offsetof(struct quota_body, qb_slv_ver) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_slv_ver));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_slv_ver) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_slv_ver));
-        LASSERTF((int)offsetof(struct quota_body, qb_lockh) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_lockh));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_lockh) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_lockh));
-        LASSERTF((int)offsetof(struct quota_body, qb_glb_lockh) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_glb_lockh));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_glb_lockh) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_glb_lockh));
-        LASSERTF((int)offsetof(struct quota_body, qb_padding1[4]) == 112, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_padding1[4]));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding1[4]) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_padding1[4]));
+       /* Checks for struct quota_body */
+       LASSERTF((int)sizeof(struct quota_body) == 112, "found %lld\n",
+                (long long)(int)sizeof(struct quota_body));
+       LASSERTF((int)offsetof(struct quota_body, qb_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_fid));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_fid));
+       LASSERTF((int)offsetof(struct quota_body, qb_id) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_id));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_id) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_id));
+       LASSERTF((int)offsetof(struct quota_body, qb_flags) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_flags));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_flags));
+       LASSERTF((int)offsetof(struct quota_body, qb_padding) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_padding));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_padding));
+       LASSERTF((int)offsetof(struct quota_body, qb_count) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_count));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_count) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_count));
+       LASSERTF((int)offsetof(struct quota_body, qb_usage) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_usage));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_usage) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_usage));
+       LASSERTF((int)offsetof(struct quota_body, qb_slv_ver) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_slv_ver));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_slv_ver) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_slv_ver));
+       LASSERTF((int)offsetof(struct quota_body, qb_lockh) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_lockh));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_lockh) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_lockh));
+       LASSERTF((int)offsetof(struct quota_body, qb_glb_lockh) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_glb_lockh));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_glb_lockh) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_glb_lockh));
+       LASSERTF((int)offsetof(struct quota_body, qb_padding1[4]) == 112, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_padding1[4]));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding1[4]) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_padding1[4]));
 
-        /* Checks for struct mgs_target_info */
-        LASSERTF((int)sizeof(struct mgs_target_info) == 4544, "found %lld\n",
-                 (long long)(int)sizeof(struct mgs_target_info));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_lustre_ver) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_lustre_ver));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_stripe_index) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_stripe_index));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_config_ver) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_config_ver));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_config_ver) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_config_ver));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_flags) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_flags));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_flags));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_nid_count) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_nid_count));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nid_count) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nid_count));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_instance) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_instance));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_instance) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_instance));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_fsname) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_fsname));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_fsname) == 64, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_fsname));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_svname) == 88, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_svname));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_svname) == 64, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_svname));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_uuid) == 152, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_uuid));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_uuid) == 40, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_uuid));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_nids) == 192, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_nids));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nids) == 256, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nids));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_params) == 448, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_params));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_params) == 4096, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_params));
+       /* Checks for struct mgs_target_info */
+       LASSERTF((int)sizeof(struct mgs_target_info) == 4544, "found %lld\n",
+                (long long)(int)sizeof(struct mgs_target_info));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_lustre_ver) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_lustre_ver));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_stripe_index) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_stripe_index));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_config_ver) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_config_ver));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_config_ver) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_config_ver));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_flags) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_flags));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_flags));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_nid_count) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_nid_count));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nid_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nid_count));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_instance) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_instance));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_instance) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_instance));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_fsname) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_fsname));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_fsname) == 64, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_fsname));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_svname) == 88, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_svname));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_svname) == 64, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_svname));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_uuid) == 152, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_uuid));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_uuid) == 40, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_uuid));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_nids) == 192, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_nids));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nids) == 256, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nids));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_params) == 448, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_params));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_params) == 4096, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_params));
 
-        /* Checks for struct lustre_capa */
-        LASSERTF((int)sizeof(struct lustre_capa) == 120, "found %lld\n",
-                 (long long)(int)sizeof(struct lustre_capa));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_fid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_fid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_opc) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_opc));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_opc) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_opc));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_uid) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_uid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_uid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_uid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_gid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_gid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_gid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_gid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_flags) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_flags));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_flags));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_keyid) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_keyid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_keyid) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_keyid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_timeout) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_timeout));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_timeout) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_timeout));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_expiry) == 52, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_expiry));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_expiry) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_expiry));
-        CLASSERT(CAPA_HMAC_MAX_LEN == 64);
-        LASSERTF((int)offsetof(struct lustre_capa, lc_hmac[64]) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_hmac[64]));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]));
+       /* Checks for struct lustre_capa */
+       LASSERTF((int)sizeof(struct lustre_capa) == 120, "found %lld\n",
+                (long long)(int)sizeof(struct lustre_capa));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_fid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_fid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_opc) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_opc));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_opc) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_opc));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_uid) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_uid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_uid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_uid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_gid) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_gid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_gid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_gid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_flags));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_flags));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_keyid) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_keyid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_keyid) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_keyid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_timeout) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_timeout));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_timeout) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_timeout));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_expiry) == 52, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_expiry));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_expiry) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_expiry));
+       CLASSERT(CAPA_HMAC_MAX_LEN == 64);
+       LASSERTF((int)offsetof(struct lustre_capa, lc_hmac[64]) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_hmac[64]));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]));
 
-        /* Checks for struct lustre_capa_key */
-        LASSERTF((int)sizeof(struct lustre_capa_key) == 72, "found %lld\n",
-                 (long long)(int)sizeof(struct lustre_capa_key));
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_seq) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_seq));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_seq) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_seq));
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_keyid) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_keyid));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_keyid) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_keyid));
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_padding) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_padding));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_padding));
-        CLASSERT(CAPA_HMAC_KEY_MAX_LEN == 56);
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_key[56]) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_key[56]));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]));
+       /* Checks for struct lustre_capa_key */
+       LASSERTF((int)sizeof(struct lustre_capa_key) == 72, "found %lld\n",
+                (long long)(int)sizeof(struct lustre_capa_key));
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_seq) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_seq));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_seq) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_seq));
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_keyid) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_keyid));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_keyid) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_keyid));
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_padding) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_padding));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_padding));
+       CLASSERT(CAPA_HMAC_KEY_MAX_LEN == 56);
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_key[56]) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_key[56]));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]));
 
-        /* Checks for struct getinfo_fid2path */
-        LASSERTF((int)sizeof(struct getinfo_fid2path) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct getinfo_fid2path));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_fid));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_fid));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_recno) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_recno));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_recno) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_recno));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_linkno) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_linkno));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_pathlen) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_pathlen));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_path[0]) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_path[0]));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]));
+       /* Checks for struct getinfo_fid2path */
+       LASSERTF((int)sizeof(struct getinfo_fid2path) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct getinfo_fid2path));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_fid));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_fid));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_recno) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_recno));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_recno) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_recno));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_linkno) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_linkno));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_pathlen) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_pathlen));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_path[0]) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_path[0]));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]));
 
-        /* Checks for struct ll_user_fiemap */
-        LASSERTF((int)sizeof(struct ll_user_fiemap) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct ll_user_fiemap));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_start) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_start));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_start) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_start));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_length) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_length));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_length) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_length));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_flags) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_flags));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_flags));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_mapped_extents) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_mapped_extents));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extent_count) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_extent_count));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_reserved) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_reserved));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extents) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_extents));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extents) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extents));
-        CLASSERT(FIEMAP_FLAG_SYNC == 0x00000001);
-        CLASSERT(FIEMAP_FLAG_XATTR == 0x00000002);
-        CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000);
+       /* Checks for struct ll_user_fiemap */
+       LASSERTF((int)sizeof(struct ll_user_fiemap) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct ll_user_fiemap));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_start) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_start));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_start) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_start));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_length) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_length));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_length) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_length));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_flags) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_flags));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_flags));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_mapped_extents) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_mapped_extents));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extent_count) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_extent_count));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_reserved) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_reserved));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extents) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_extents));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extents) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extents));
+       CLASSERT(FIEMAP_FLAG_SYNC == 0x00000001);
+       CLASSERT(FIEMAP_FLAG_XATTR == 0x00000002);
+       CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000);
 
-        /* Checks for struct ll_fiemap_extent */
-        LASSERTF((int)sizeof(struct ll_fiemap_extent) == 56, "found %lld\n",
-                 (long long)(int)sizeof(struct ll_fiemap_extent));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_logical) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_logical));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_physical) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_physical));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_length) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_length));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_length) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_length));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_flags));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_device));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_device) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_device));
-        CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
-        CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
-        CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004);
-        CLASSERT(FIEMAP_EXTENT_ENCODED == 0x00000008);
-        CLASSERT(FIEMAP_EXTENT_DATA_ENCRYPTED == 0x00000080);
-        CLASSERT(FIEMAP_EXTENT_NOT_ALIGNED == 0x00000100);
-        CLASSERT(FIEMAP_EXTENT_DATA_INLINE == 0x00000200);
-        CLASSERT(FIEMAP_EXTENT_DATA_TAIL == 0x00000400);
-        CLASSERT(FIEMAP_EXTENT_UNWRITTEN == 0x00000800);
-        CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000);
-        CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
-        CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
+       /* Checks for struct ll_fiemap_extent */
+       LASSERTF((int)sizeof(struct ll_fiemap_extent) == 56, "found %lld\n",
+                (long long)(int)sizeof(struct ll_fiemap_extent));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_logical) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_logical));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_physical) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_physical));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_length) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_length));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_length) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_length));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_flags));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_device));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_device) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_device));
+       CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
+       CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
+       CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004);
+       CLASSERT(FIEMAP_EXTENT_ENCODED == 0x00000008);
+       CLASSERT(FIEMAP_EXTENT_DATA_ENCRYPTED == 0x00000080);
+       CLASSERT(FIEMAP_EXTENT_NOT_ALIGNED == 0x00000100);
+       CLASSERT(FIEMAP_EXTENT_DATA_INLINE == 0x00000200);
+       CLASSERT(FIEMAP_EXTENT_DATA_TAIL == 0x00000400);
+       CLASSERT(FIEMAP_EXTENT_UNWRITTEN == 0x00000800);
+       CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000);
+       CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
+       CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
 #ifdef LIBLUSTRE_POSIX_ACL
 
-        /* Checks for type posix_acl_xattr_entry */
-        LASSERTF((int)sizeof(posix_acl_xattr_entry) == 8, "found %lld\n",
-                 (long long)(int)sizeof(posix_acl_xattr_entry));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_tag) == 0, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_tag));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_tag) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_tag));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_perm) == 2, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_perm));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_perm) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_perm));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_id) == 4, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_id));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_id) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_id));
+       /* Checks for type posix_acl_xattr_entry */
+       LASSERTF((int)sizeof(posix_acl_xattr_entry) == 8, "found %lld\n",
+                (long long)(int)sizeof(posix_acl_xattr_entry));
+       LASSERTF((int)offsetof(posix_acl_xattr_entry, e_tag) == 0, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_entry, e_tag));
+       LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_tag) == 2, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_tag));
+       LASSERTF((int)offsetof(posix_acl_xattr_entry, e_perm) == 2, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_entry, e_perm));
+       LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_perm) == 2, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_perm));
+       LASSERTF((int)offsetof(posix_acl_xattr_entry, e_id) == 4, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_entry, e_id));
+       LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_id) == 4, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_id));
 
-        /* Checks for type posix_acl_xattr_header */
-        LASSERTF((int)sizeof(posix_acl_xattr_header) == 4, "found %lld\n",
-                 (long long)(int)sizeof(posix_acl_xattr_header));
-        LASSERTF((int)offsetof(posix_acl_xattr_header, a_version) == 0, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_header, a_version));
-        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_version) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_version));
-        LASSERTF((int)offsetof(posix_acl_xattr_header, a_entries) == 4, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_header, a_entries));
-        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_entries) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_entries));
+       /* Checks for type posix_acl_xattr_header */
+       LASSERTF((int)sizeof(posix_acl_xattr_header) == 4, "found %lld\n",
+                (long long)(int)sizeof(posix_acl_xattr_header));
+       LASSERTF((int)offsetof(posix_acl_xattr_header, a_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_header, a_version));
+       LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_version));
+       LASSERTF((int)offsetof(posix_acl_xattr_header, a_entries) == 4, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_header, a_entries));
+       LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_entries) == 0, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_entries));
 #endif
 
-        /* Checks for struct link_ea_header */
-        LASSERTF((int)sizeof(struct link_ea_header) == 24, "found %lld\n",
-                 (long long)(int)sizeof(struct link_ea_header));
-        LASSERTF((int)offsetof(struct link_ea_header, leh_magic) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, leh_magic));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_magic) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->leh_magic));
-        LASSERTF((int)offsetof(struct link_ea_header, leh_reccount) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, leh_reccount));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_reccount) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->leh_reccount));
-        LASSERTF((int)offsetof(struct link_ea_header, leh_len) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, leh_len));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_len) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->leh_len));
-        LASSERTF((int)offsetof(struct link_ea_header, padding1) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, padding1));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->padding1));
-        LASSERTF((int)offsetof(struct link_ea_header, padding2) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, padding2));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding2) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->padding2));
-        CLASSERT(LINK_EA_MAGIC == 0x11EAF1DFUL);
+       /* Checks for struct link_ea_header */
+       LASSERTF((int)sizeof(struct link_ea_header) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct link_ea_header));
+       LASSERTF((int)offsetof(struct link_ea_header, leh_magic) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, leh_magic));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_magic) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->leh_magic));
+       LASSERTF((int)offsetof(struct link_ea_header, leh_reccount) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, leh_reccount));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_reccount) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->leh_reccount));
+       LASSERTF((int)offsetof(struct link_ea_header, leh_len) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, leh_len));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_len) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->leh_len));
+       LASSERTF((int)offsetof(struct link_ea_header, padding1) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, padding1));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->padding1));
+       LASSERTF((int)offsetof(struct link_ea_header, padding2) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, padding2));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding2) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->padding2));
+       CLASSERT(LINK_EA_MAGIC == 0x11EAF1DFUL);
 
-        /* Checks for struct link_ea_entry */
-        LASSERTF((int)sizeof(struct link_ea_entry) == 18, "found %lld\n",
-                 (long long)(int)sizeof(struct link_ea_entry));
-        LASSERTF((int)offsetof(struct link_ea_entry, lee_reclen) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_entry, lee_reclen));
-        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_reclen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_reclen));
-        LASSERTF((int)offsetof(struct link_ea_entry, lee_parent_fid) == 2, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_entry, lee_parent_fid));
-        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
-        LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 18, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_entry, lee_name));
-        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_name) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_name));
+       /* Checks for struct link_ea_entry */
+       LASSERTF((int)sizeof(struct link_ea_entry) == 18, "found %lld\n",
+                (long long)(int)sizeof(struct link_ea_entry));
+       LASSERTF((int)offsetof(struct link_ea_entry, lee_reclen) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_entry, lee_reclen));
+       LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_reclen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_reclen));
+       LASSERTF((int)offsetof(struct link_ea_entry, lee_parent_fid) == 2, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_entry, lee_parent_fid));
+       LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
+       LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 18, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_entry, lee_name));
+       LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_name) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_name));
 
-        /* Checks for struct hsm_user_item */
-        LASSERTF((int)sizeof(struct hsm_user_item) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_user_item));
-        LASSERTF((int)offsetof(struct hsm_user_item, hui_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_item, hui_fid));
-        LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_fid));
-        LASSERTF((int)offsetof(struct hsm_user_item, hui_extent) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_item, hui_extent));
-        LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_extent) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_extent));
+       /* Checks for struct layout_intent */
+       LASSERTF((int)sizeof(struct layout_intent) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct layout_intent));
+       LASSERTF((int)offsetof(struct layout_intent, li_opc) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_opc));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_opc) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_opc));
+       LASSERTF((int)offsetof(struct layout_intent, li_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_flags));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_flags));
+       LASSERTF((int)offsetof(struct layout_intent, li_start) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_start));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_start) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_start));
+       LASSERTF((int)offsetof(struct layout_intent, li_end) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_end));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_end) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_end));
+       LASSERTF(LAYOUT_INTENT_ACCESS == 0, "found %lld\n",
+                (long long)LAYOUT_INTENT_ACCESS);
+       LASSERTF(LAYOUT_INTENT_READ == 1, "found %lld\n",
+                (long long)LAYOUT_INTENT_READ);
+       LASSERTF(LAYOUT_INTENT_WRITE == 2, "found %lld\n",
+                (long long)LAYOUT_INTENT_WRITE);
+       LASSERTF(LAYOUT_INTENT_GLIMPSE == 3, "found %lld\n",
+                (long long)LAYOUT_INTENT_GLIMPSE);
+       LASSERTF(LAYOUT_INTENT_TRUNC == 4, "found %lld\n",
+                (long long)LAYOUT_INTENT_TRUNC);
+       LASSERTF(LAYOUT_INTENT_RELEASE == 5, "found %lld\n",
+                (long long)LAYOUT_INTENT_RELEASE);
+       LASSERTF(LAYOUT_INTENT_RESTORE == 6, "found %lld\n",
+                (long long)LAYOUT_INTENT_RESTORE);
 
-        /* Checks for struct hsm_user_request */
-        LASSERTF((int)sizeof(struct hsm_user_request) == 16, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_user_request));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_action) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_action));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_action) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_action));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_archive_num) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_archive_num));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_archive_num) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_archive_num));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_itemcount) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_itemcount));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_itemcount) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_itemcount));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_data_len) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_data_len));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_data_len) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_data_len));
+       /* Checks for struct hsm_action_item */
+       LASSERTF((int)sizeof(struct hsm_action_item) == 72, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_action_item));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_len) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_len));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_len) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_len));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_action) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_action));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_action) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_action));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_fid) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_fid));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_fid));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_dfid) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_dfid));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_dfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_dfid));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_extent) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_extent));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_extent));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_cookie) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_cookie));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_cookie) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_cookie));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_gid) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_gid));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_gid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_gid));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_data) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_data));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_data) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_data));
 
-        /* Checks for struct hsm_user_state */
-        LASSERTF((int)sizeof(struct hsm_user_state) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_user_state));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_states) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_states));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_states) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_states));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_archive_num) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_archive_num));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_archive_num) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_archive_num));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_state) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_state));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_action) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_action));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_location) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_location));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location));
+       /* Checks for struct hsm_action_list */
+       LASSERTF((int)sizeof(struct hsm_action_list) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_action_list));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_version));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_version));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_count) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_count));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_count));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_compound_id) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_compound_id));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_compound_id) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_compound_id));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_flags) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_flags));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_flags) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_flags));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_archive_num) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_archive_num));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_archive_num) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_archive_num));
+       LASSERTF((int)offsetof(struct hsm_action_list, padding1) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, padding1));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->padding1));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_fsname) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_fsname));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_fsname) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_fsname));
 
-        /* Checks for struct layout_intent */
-        LASSERTF((int)sizeof(struct layout_intent) == 24, "found %lld\n",
-                 (long long)(int)sizeof(struct layout_intent));
-        LASSERTF((int)offsetof(struct layout_intent, li_opc) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_opc));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_opc) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_opc));
-        LASSERTF((int)offsetof(struct layout_intent, li_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_flags));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_flags));
-        LASSERTF((int)offsetof(struct layout_intent, li_start) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_start));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_start) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_start));
-        LASSERTF((int)offsetof(struct layout_intent, li_end) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_end));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_end) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_end));
-        LASSERTF(LAYOUT_INTENT_ACCESS == 0, "found %lld\n",
-                 (long long)LAYOUT_INTENT_ACCESS);
-        LASSERTF(LAYOUT_INTENT_READ == 1, "found %lld\n",
-                 (long long)LAYOUT_INTENT_READ);
-        LASSERTF(LAYOUT_INTENT_WRITE == 2, "found %lld\n",
-                 (long long)LAYOUT_INTENT_WRITE);
-        LASSERTF(LAYOUT_INTENT_GLIMPSE == 3, "found %lld\n",
-                 (long long)LAYOUT_INTENT_GLIMPSE);
-        LASSERTF(LAYOUT_INTENT_TRUNC == 4, "found %lld\n",
-                 (long long)LAYOUT_INTENT_TRUNC);
-        LASSERTF(LAYOUT_INTENT_RELEASE == 5, "found %lld\n",
-                 (long long)LAYOUT_INTENT_RELEASE);
-        LASSERTF(LAYOUT_INTENT_RESTORE == 6, "found %lld\n",
-                 (long long)LAYOUT_INTENT_RESTORE);
+       /* Checks for struct hsm_progress */
+       LASSERTF((int)sizeof(struct hsm_progress) == 48, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_progress));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_fid));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_fid));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_cookie) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_cookie));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_cookie) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_cookie));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_extent) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_extent));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_extent));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_flags));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_flags));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_errval) == 42, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_errval));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_errval) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_errval));
+       LASSERTF((int)offsetof(struct hsm_progress, padding) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, padding));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->padding));
+       LASSERTF(HP_FLAG_COMPLETED == 0x01, "found 0x%.8x\n",
+               HP_FLAG_COMPLETED);
+       LASSERTF(HP_FLAG_RETRY == 0x02, "found 0x%.8x\n",
+               HP_FLAG_RETRY);
+
+       LASSERTF((int)offsetof(struct hsm_copy, hc_data_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_data_version));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_data_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_data_version));
+       LASSERTF((int)offsetof(struct hsm_copy, hc_flags) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_flags));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_flags));
+       LASSERTF((int)offsetof(struct hsm_copy, hc_errval) == 10, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_errval));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_errval) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_errval));
+       LASSERTF((int)offsetof(struct hsm_copy, padding) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, padding));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->padding));
+       LASSERTF((int)offsetof(struct hsm_copy, hc_hai) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_hai));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_hai) == 72, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_hai));
+
+       /* Checks for struct hsm_progress_kernel */
+       LASSERTF((int)sizeof(struct hsm_progress_kernel) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_progress_kernel));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_fid));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_fid));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_cookie) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_cookie));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_cookie) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_cookie));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_extent) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_extent));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_extent));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_flags));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_flags));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_errval) == 42, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_errval));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_errval) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_errval));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_padding1) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_padding1));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding1));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_data_version) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_data_version));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_data_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_data_version));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_padding2) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_padding2));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding2));
+
+       /* Checks for struct hsm_user_item */
+       LASSERTF((int)sizeof(struct hsm_user_item) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_user_item));
+       LASSERTF((int)offsetof(struct hsm_user_item, hui_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_item, hui_fid));
+       LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_fid));
+       LASSERTF((int)offsetof(struct hsm_user_item, hui_extent) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_item, hui_extent));
+       LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_extent));
+
+       /* Checks for struct hsm_user_state */
+       LASSERTF((int)sizeof(struct hsm_user_state) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_user_state));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_states) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_states));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_states) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_states));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_archive_num) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_archive_num));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_archive_num) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_archive_num));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_state) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_state));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_action) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_action));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_location) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_location));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location));
 }
 
index f89e61d..1e17584 100644 (file)
@@ -39,7 +39,7 @@
  * The copytool acts on action requests from Lustre to copy files to and from
  * an HSM archive system.
  *
- * Note: under Linux, until llapi_copytool_fini is called (or the program is
+ * Note: under Linux, until llapi_hsm_copytool_fini is called (or the program is
  * killed), the libcfs module will be referenced and unremovable,
  * even after Lustre services stop.
  */
@@ -63,7 +63,7 @@ void handler(int signal ) {
          * and doesn't remove us from mtab (EINPROGRESS). The lustre client
          * does successfully unmount and the mount is actually gone, but the
          * mtab entry remains. So this just makes mtab happier. */
-        llapi_copytool_fini(&ctdata);
+       llapi_hsm_copytool_fini(&ctdata);
         exit(1);
 }
 
@@ -94,7 +94,7 @@ int main(int argc, char **argv) {
                 return -EINVAL;
         }
 
-        rc = llapi_copytool_start(&ctdata, argv[optind], 0,
+       rc = llapi_hsm_copytool_start(&ctdata, argv[optind], 0,
                                   ARRAY_SIZE(archives), archives);
         if (rc < 0) {
                 fprintf(stderr, "Can't start copytool interface: %s\n",
@@ -103,7 +103,7 @@ int main(int argc, char **argv) {
         }
 
         if (test)
-                return -llapi_copytool_fini(&ctdata);
+               return -llapi_hsm_copytool_fini(&ctdata);
 
         printf("Waiting for message from kernel (pid=%d)\n", getpid());
 
@@ -114,7 +114,7 @@ int main(int argc, char **argv) {
                 struct hsm_action_item *hai;
                 int msgsize, i = 0;
 
-                rc = llapi_copytool_recv(ctdata, &hal, &msgsize);
+               rc = llapi_hsm_copytool_recv(ctdata, &hal, &msgsize);
                 if (rc == -ESHUTDOWN) {
                         fprintf(stderr, "shutting down");
                         break;
@@ -139,10 +139,10 @@ int main(int argc, char **argv) {
                         hai = hai_next(hai);
                 }
 
-                llapi_copytool_free(&hal);
+               llapi_hsm_copytool_free(&hal);
         }
 
-        llapi_copytool_fini(&ctdata);
+       llapi_hsm_copytool_fini(&ctdata);
 
         return -rc;
 }
diff --git a/lustre/utils/LCOPYING b/lustre/utils/LCOPYING
new file mode 100644 (file)
index 0000000..542b54b
--- /dev/null
@@ -0,0 +1,462 @@
+This licence file applies to new library files:
+lustre/utils/liblustreapi_hsm.c
+lustre/utils/lustreapi_internal.h
+------------------------------------------------------------------------------- 
+                 GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+\f
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+\f
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+\f
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+\f
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+\f
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+\f
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+\f
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+\f
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
index e7c52a3..1309376 100644 (file)
@@ -83,7 +83,9 @@ llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
 
 L_IOCTL := $(top_builddir)/libcfs/libcfs/util/l_ioctl.c
 L_KERNELCOMM := $(top_builddir)/libcfs/libcfs/kernel_user_comm.c
-liblustreapitmp_a_SOURCES = liblustreapi.c $(L_IOCTL) $(L_KERNELCOMM)
+liblustreapitmp_a_SOURCES = liblustreapi.c liblustreapi_hsm.c \
+                           lustreapi_internal.h \
+                           $(L_IOCTL) $(L_KERNELCOMM)
 
 # build static and shared lib lustreapi
 liblustreapi.a : liblustreapitmp.a
index 4939034..48a1453 100644 (file)
@@ -73,6 +73,7 @@
 #include <obd.h>
 #include <obd_lov.h>
 #include <lustre/lustreapi.h>
+#include "lustreapi_internal.h"
 
 static unsigned llapi_dir_filetype_table[] = {
         [DT_UNKNOWN]= 0,
@@ -650,13 +651,7 @@ int llapi_file_create_pool(const char *name, unsigned long long stripe_size,
  * Find the fsname, the full path, and/or an open fd.
  * Either the fsname or path must not be NULL
  */
-#define WANT_PATH   0x1
-#define WANT_FSNAME 0x2
-#define WANT_FD     0x4
-#define WANT_INDEX  0x8
-#define WANT_ERROR  0x10
-static int get_root_path(int want, char *fsname, int *outfd, char *path,
-                         int index)
+int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
 {
         struct mntent mnt;
         char buf[PATH_MAX], mntdir[PATH_MAX];
@@ -807,6 +802,11 @@ int llapi_search_fsname(const char *pathname, char *fsname)
         return rc;
 }
 
+int llapi_search_rootpath(char *pathname, const char *fsname)
+{
+       return get_root_path(WANT_PATH, (char *)fsname, NULL, pathname, -1);
+}
+
 int llapi_getname(const char *path, char *buf, size_t size)
 {
         struct obd_uuid uuid_buf;
@@ -3424,8 +3424,8 @@ static int get_mdtname(char *name, char *format, char *buf)
  * \param mdtidxp pointer to integer within data to be filled in with the
  *    mdt index (0 if no mdt is specified).  NULL won't be filled.
  */
-static int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
-                      int want_error)
+int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
+              int want_error)
 {
         char fsname[20];
         char *ptr;
@@ -3761,183 +3761,6 @@ int llapi_path2fid(const char *path, lustre_fid *fid)
        return rc;
 }
 
-/****** HSM Copytool API ********/
-#define CT_PRIV_MAGIC 0xC0BE2001
-struct copytool_private {
-        int magic;
-        char *fsname;
-        lustre_kernelcomm kuc;
-        __u32 archives;
-};
-
-#include <libcfs/libcfs.h>
-
-/** Register a copytool
- * @param[out] priv Opaque private control structure
- * @param fsname Lustre filesystem
- * @param flags Open flags, currently unused (e.g. O_NONBLOCK)
- * @param archive_count
- * @param archives Which archive numbers this copytool is responsible for
- */
-int llapi_copytool_start(void **priv, char *fsname, int flags,
-                         int archive_count, int *archives)
-{
-        struct copytool_private *ct;
-        int rc;
-
-        if (archive_count > 0 && archives == NULL) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "NULL archive numbers");
-                return -EINVAL;
-        }
-
-        ct = calloc(1, sizeof(*ct));
-        if (ct == NULL)
-                return -ENOMEM;
-
-        ct->fsname = malloc(strlen(fsname) + 1);
-        if (ct->fsname == NULL) {
-                rc = -ENOMEM;
-                goto out_err;
-        }
-        strcpy(ct->fsname, fsname);
-        ct->magic = CT_PRIV_MAGIC;
-        ct->archives = 0;
-        for (rc = 0; rc < archive_count; rc++) {
-                if (archives[rc] > sizeof(ct->archives)) {
-                        llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                          "Maximum of %d archives supported",
-                                          sizeof(ct->archives));
-                        goto out_err;
-                }
-                ct->archives |= 1 << archives[rc];
-        }
-        /* special case: if no archives specified, default to archive #0. */
-        if (ct->archives == 0)
-                ct->archives = 1;
-
-        rc = libcfs_ukuc_start(&ct->kuc, KUC_GRP_HSM);
-        if (rc < 0)
-                goto out_err;
-
-        /* Storing archive(s) in lk_data; see mdc_ioc_hsm_ct_start */
-        ct->kuc.lk_data = ct->archives;
-        rc = root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL,
-                        WANT_ERROR);
-        /* Only the kernel reference keeps the write side open */
-        close(ct->kuc.lk_wfd);
-        ct->kuc.lk_wfd = 0;
-        if (rc < 0)
-                goto out_err;
-
-        *priv = ct;
-        return 0;
-
-out_err:
-        if (ct->fsname)
-                free(ct->fsname);
-        free(ct);
-        return rc;
-}
-
-/** Deregister a copytool */
-int llapi_copytool_fini(void **priv)
-{
-        struct copytool_private *ct = (struct copytool_private *)*priv;
-
-        if (!ct || (ct->magic != CT_PRIV_MAGIC))
-                return -EINVAL;
-
-        /* Tell the kernel to stop sending us messages */
-        ct->kuc.lk_flags = LK_FLG_STOP;
-        root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL, 0);
-
-        /* Shut down the kernelcomms */
-        libcfs_ukuc_stop(&ct->kuc);
-
-        free(ct->fsname);
-        free(ct);
-        *priv = NULL;
-        return 0;
-}
-
-/** Wait for the next hsm_action_list
- * @param priv Opaque private control structure
- * @param halh Action list handle, will be allocated here
- * @param msgsize Number of bytes in the message, will be set here
- * @return 0 valid message received; halh and msgsize are set
- *         <0 error code
- */
-int llapi_copytool_recv(void *priv, struct hsm_action_list **halh, int *msgsize)
-{
-        struct copytool_private *ct = (struct copytool_private *)priv;
-        struct kuc_hdr *kuch;
-        struct hsm_action_list *hal;
-        int rc = 0;
-
-        if (!ct || (ct->magic != CT_PRIV_MAGIC))
-                return -EINVAL;
-        if (halh == NULL || msgsize == NULL)
-                return -EINVAL;
-
-        kuch = malloc(HAL_MAXSIZE + sizeof(*kuch));
-        if (kuch == NULL)
-                return -ENOMEM;
-
-        rc = libcfs_ukuc_msg_get(&ct->kuc, (char *)kuch,
-                                 HAL_MAXSIZE + sizeof(*kuch),
-                                 KUC_TRANSPORT_HSM);
-        if (rc < 0)
-                goto out_free;
-
-        /* Handle generic messages */
-        if (kuch->kuc_transport == KUC_TRANSPORT_GENERIC &&
-            kuch->kuc_msgtype == KUC_MSG_SHUTDOWN) {
-                rc = -ESHUTDOWN;
-                goto out_free;
-        }
-
-        if (kuch->kuc_transport != KUC_TRANSPORT_HSM ||
-            kuch->kuc_msgtype != HMT_ACTION_LIST) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "Unknown HSM message type %d:%d\n",
-                                  kuch->kuc_transport, kuch->kuc_msgtype);
-                rc = -EPROTO;
-                goto out_free;
-        }
-
-        /* Our message is a hsm_action_list.  Use pointer math to skip
-         * kuch_hdr and point directly to the message payload.
-         */
-        hal = (struct hsm_action_list *)(kuch + 1);
-
-        /* Check that we have registered for this archive # */
-        if (((1 << hal->hal_archive_num) & ct->archives) == 0) {
-                    llapi_err_noerrno(LLAPI_MSG_INFO,
-                             "Ignoring request for archive #%d (bitmask %#x)\n",
-                             hal->hal_archive_num, ct->archives);
-                rc = 0;
-                goto out_free;
-        }
-
-        *halh = hal;
-        *msgsize = kuch->kuc_msglen - sizeof(*kuch);
-        return 0;
-
-out_free:
-        *halh = NULL;
-        *msgsize = 0;
-        free(kuch);
-        return rc;
-}
-
-/** Release the action list when done with it. */
-int llapi_copytool_free(struct hsm_action_list **hal)
-{
-       /* Reuse the llapi_changelog_free function */
-       return llapi_changelog_free((struct changelog_ext_rec **)hal);
-}
-
 int llapi_get_connect_flags(const char *mnt, __u64 *flags)
 {
         DIR *root;
diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
new file mode 100644 (file)
index 0000000..c32fcfe
--- /dev/null
@@ -0,0 +1,454 @@
+/*
+ * LGPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
+ *     alternatives
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 or (at your discretion) any later version.
+ * (LGPL) version 2.1 accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * LGPL HEADER END
+ */
+/*
+ * lustre/utils/liblustreapi_hsm.c
+ *
+ * lustreapi library for hsm calls
+ *
+ * Author: Aurelien Degremont <aurelien.degremont@cea.fr>
+ * Author: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
+ * Author: Thomas leibovici <thomas.leibovici@cea.fr>
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stddef.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <errno.h>
+#include <dirent.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/syscall.h>
+#include <fnmatch.h>
+#include <glob.h>
+#ifdef HAVE_LINUX_UNISTD_H
+#include <linux/unistd.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <liblustre.h>
+#include <lnet/lnetctl.h>
+#include <obd.h>
+#include <obd_lov.h>
+#include <lustre/lustreapi.h>
+#include "lustreapi_internal.h"
+
+/*
+ * fake functions, real one will come with HSM flags patch
+ */
+static int llapi_hsm_state_set(const char *path, __u64 setmask, __u64 clearmask,
+                              __u32 archive_num)
+{
+       return 0;
+}
+
+/****** HSM Copytool API ********/
+#define CT_PRIV_MAGIC 0xC0BE2001
+struct hsm_copytool_private {
+       int                      magic;
+       char                    *fsname;
+       lustre_kernelcomm        kuc;
+       __u32                    archives;
+};
+
+#include <libcfs/libcfs.h>
+
+/** Register a copytool
+ * \param[out] priv Opaque private control structure
+ * \param fsname Lustre filesystem
+ * \param flags Open flags, currently unused (e.g. O_NONBLOCK)
+ * \param archive_count
+ * \param archives Which archive numbers this copytool is responsible for
+ */
+int llapi_hsm_copytool_start(void **priv, char *fsname, int flags,
+                            int archive_count, int *archives)
+{
+       struct hsm_copytool_private     *ct;
+       int                              rc;
+
+       if (archive_count > 0 && archives == NULL) {
+               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "NULL archive numbers");
+               return -EINVAL;
+       }
+
+       ct = calloc(1, sizeof(*ct));
+       if (ct == NULL)
+               return -ENOMEM;
+
+       ct->fsname = malloc(strlen(fsname) + 1);
+       if (ct->fsname == NULL) {
+               rc = -ENOMEM;
+               goto out_err;
+       }
+       strcpy(ct->fsname, fsname);
+       ct->magic = CT_PRIV_MAGIC;
+
+       /* no archives specified means "match all". */
+       ct->archives = 0;
+       for (rc = 0; rc < archive_count; rc++) {
+               if (archives[rc] > 8 * sizeof(ct->archives)) {
+                       llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                         "Maximum of %d archives supported",
+                                         8 * sizeof(ct->archives));
+                       goto out_err;
+               }
+               /* in the list we have a all archive wildcard
+                * so move to all archives mode
+                */
+               if (archives[rc] == 0) {
+                       ct->archives = 0;
+                       archive_count = 0;
+                       break;
+               }
+               ct->archives |= (1 << (archives[rc] - 1));
+       }
+
+       rc = libcfs_ukuc_start(&ct->kuc, KUC_GRP_HSM);
+       if (rc < 0)
+               goto out_err;
+
+       /* Storing archive(s) in lk_data; see mdc_ioc_hsm_ct_start */
+       ct->kuc.lk_data = ct->archives;
+       rc = root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL,
+                       WANT_ERROR);
+       /* ignore if it was already registered on coordinator */
+       if (rc == -EEXIST)
+               rc = 0;
+       /* Only the kernel reference keeps the write side open */
+       close(ct->kuc.lk_wfd);
+       ct->kuc.lk_wfd = 0;
+       if (rc < 0)
+               goto out_err;
+
+       *priv = ct;
+       return 0;
+
+out_err:
+       if (ct->fsname)
+               free(ct->fsname);
+       free(ct);
+       return rc;
+}
+
+/** Deregister a copytool
+ * Note: under Linux, until llapi_hsm_copytool_fini is called (or the program is
+ * killed), the libcfs module will be referenced and unremovable,
+ * even after Lustre services stop.
+ */
+int llapi_hsm_copytool_fini(void **priv)
+{
+       struct hsm_copytool_private *ct;
+
+       ct = (struct hsm_copytool_private *)priv;
+       if (!ct || (ct->magic != CT_PRIV_MAGIC))
+               return -EINVAL;
+
+       /* Tell the kernel to stop sending us messages */
+       ct->kuc.lk_flags = LK_FLG_STOP;
+       root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL, 0);
+
+       /* Shut down the kernelcomms */
+       libcfs_ukuc_stop(&ct->kuc);
+
+       free(ct->fsname);
+       free(ct);
+       *priv = NULL;
+       return 0;
+}
+
+/** Wait for the next hsm_action_list
+ * \param priv Opaque private control structure
+ * \param halh Action list handle, will be allocated here
+ * \param msgsize Number of bytes in the message, will be set here
+ * \return 0 valid message received; halh and msgsize are set
+ *        <0 error code
+ */
+int llapi_hsm_copytool_recv(void *priv, struct hsm_action_list **halh,
+                           int *msgsize)
+{
+       struct hsm_copytool_private     *ct;
+       struct kuc_hdr                  *kuch;
+       struct hsm_action_list          *hal;
+       int                              rc = 0;
+
+       ct = (struct hsm_copytool_private *)priv;
+       if (!ct || (ct->magic != CT_PRIV_MAGIC))
+               return -EINVAL;
+       if (halh == NULL || msgsize == NULL)
+               return -EINVAL;
+
+       kuch = malloc(HAL_MAXSIZE + sizeof(*kuch));
+       if (kuch == NULL)
+               return -ENOMEM;
+
+       rc = libcfs_ukuc_msg_get(&ct->kuc, (char *)kuch,
+                                HAL_MAXSIZE + sizeof(*kuch),
+                                KUC_TRANSPORT_HSM);
+       if (rc < 0)
+               goto out_free;
+
+       /* Handle generic messages */
+       if (kuch->kuc_transport == KUC_TRANSPORT_GENERIC &&
+           kuch->kuc_msgtype == KUC_MSG_SHUTDOWN) {
+               rc = -ESHUTDOWN;
+               goto out_free;
+       }
+
+       if (kuch->kuc_transport != KUC_TRANSPORT_HSM ||
+           kuch->kuc_msgtype != HMT_ACTION_LIST) {
+               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "Unknown HSM message type %d:%d\n",
+                                 kuch->kuc_transport, kuch->kuc_msgtype);
+               rc = -EPROTO;
+               goto out_free;
+       }
+
+       if (kuch->kuc_msglen < sizeof(*kuch) + sizeof(*hal)) {
+               llapi_err_noerrno(LLAPI_MSG_ERROR, "Short HSM message %d",
+                                 kuch->kuc_msglen);
+               rc = -EPROTO;
+               goto out_free;
+       }
+
+       /* Our message is a hsm_action_list. Use pointer math to skip
+       * kuch_hdr and point directly to the message payload.
+       */
+       hal = (struct hsm_action_list *)(kuch + 1);
+
+       /* Check that we have registered for this archive #
+        * if 0 registered, we serve any archive */
+       if (ct->archives &&
+           ((1 << (hal->hal_archive_num - 1)) & ct->archives) == 0) {
+               llapi_err_noerrno(LLAPI_MSG_INFO,
+                                 "This copytool does not service archive #%d,"
+                                 " ignoring this request."
+                                 " Mask of served archive is 0x%.8X",
+                                 hal->hal_archive_num, ct->archives);
+               rc = -EAGAIN;
+
+               goto out_free;
+       }
+
+       *halh = hal;
+       *msgsize = kuch->kuc_msglen - sizeof(*kuch);
+       return 0;
+
+out_free:
+       *halh = NULL;
+       *msgsize = 0;
+       free(kuch);
+       return rc;
+}
+
+/** Release the action list when done with it. */
+int llapi_hsm_copytool_free(struct hsm_action_list **hal)
+{
+       /* Reuse the llapi_changelog_free function */
+       return llapi_changelog_free((struct changelog_ext_rec **)hal);
+}
+
+
+/**
+ * Should be called by copytools just before starting handling a request.
+ * It could be skipped if copytool only want to directly report an error,
+ * \see llapi_hsm_copy_end().
+ *
+ * \param mnt   Mount point of the corresponding Lustre filesystem.
+ * \param hai   The hsm_action_item describing the request they will handle.
+ * \param copy  Updated by this call. Caller will passed it to
+ *             llapi_hsm_copy_end()
+ *
+ * \return 0 on success.
+ */
+int llapi_hsm_copy_start(char *mnt, struct hsm_copy *copy,
+                        const struct hsm_action_item *hai)
+{
+       int     fd;
+       int     rc;
+
+       if (memcpy(&copy->hc_hai, hai, sizeof(*hai)) == NULL)
+               RETURN(-EFAULT);
+
+       rc = get_root_path(WANT_FD, NULL, &fd, mnt, -1);
+       if (rc)
+               return rc;
+
+       rc = ioctl(fd, LL_IOC_HSM_COPY_START, copy);
+       close(fd);
+
+       return rc;
+}
+
+/**
+ * Should be called by copytools just having finished handling the request.
+ *
+ * \param mnt   Mount point of the corresponding Lustre filesystem.
+ * \param copy  The element used when calling llapi_hsm_copy_start()
+ * \param hp    A hsm_progress structure describing the final state of the
+ *             request.
+ *
+ * There is a special case which can be used only when the copytool cannot
+ * start the copy at all and want to directly return an error. In this case,
+ * simply fill \a hp structure and set \a copy to NULL. It is useless to call
+ * llapi_hsm_copy_start() in this case.
+ *
+ * \return 0 on success.
+ */
+int llapi_hsm_copy_end(char *mnt, struct hsm_copy *copy,
+                      const struct hsm_progress *hp)
+{
+       int     end_only = 0;
+       int     fd;
+       int     rc;
+
+       /* llapi_hsm_copy_start() was skipped, so alloc copy. It will
+        * only be used to give the needed progress information. */
+       if (copy == NULL) {
+               /* This is only ok if there is an error. */
+               if (hp->hp_errval == 0)
+                       return -EINVAL;
+
+               copy = (struct hsm_copy *)malloc(sizeof(*copy));
+               if (copy == NULL)
+                       return -ENOMEM;
+               end_only = 1;
+               copy->hc_hai.hai_cookie = hp->hp_cookie;
+               copy->hc_hai.hai_fid = hp->hp_fid;
+               copy->hc_hai.hai_action = HSMA_NONE;
+       }
+
+       /* Fill the last missing data that will be needed by kernel
+        * to send a hsm_progress. */
+       copy->hc_flags = hp->hp_flags;
+       copy->hc_errval = hp->hp_errval;
+       /* Update hai if it has changed since start */
+       copy->hc_hai.hai_extent = hp->hp_extent;
+
+       rc = get_root_path(WANT_FD, NULL, &fd, mnt, -1);
+       if (rc)
+               goto out_free;
+
+       rc = ioctl(fd, LL_IOC_HSM_COPY_END, copy);
+       close(fd);
+
+out_free:
+       if (end_only)
+               free(copy);
+
+       return rc;
+}
+
+/**
+ * Copytool progress reporting.
+ *
+ * \a hp->hp_errval should be EAGAIN until action is completely finished.
+ *
+ * \return 0 on success, an error code otherwise.
+ */
+int llapi_hsm_progress(char *mnt, struct hsm_progress *hp)
+{
+       int     fd;
+       int     rc;
+
+       rc = get_root_path(WANT_FD, NULL, &fd, mnt, -1);
+       if (rc)
+               return rc;
+
+       rc = ioctl(fd, LL_IOC_HSM_PROGRESS, hp);
+       /* If error, save errno value */
+       rc = rc ? -errno : 0;
+
+       close(fd);
+       return rc;
+}
+
+/**
+ * Import an existing hsm-archived file into Lustre.
+ *
+ * Caller must access file by (returned) newfid value from now on.
+ *
+ * \param dst      path to Lustre destination (e.g. /mnt/lustre/my/file).
+ * \param archive  archive number.
+ * \param st       struct stat buffer containing file ownership, perm, etc.
+ * \param stripe_* Striping options.  Currently ignored, since the restore
+ *                 operation will set the striping.  In V2, this striping might
+ *                 be used.
+ * \param newfid[out] Filled with new Lustre fid.
+ */
+int llapi_hsm_import(const char *dst, int archive, struct stat *st,
+                    unsigned long long stripe_size, int stripe_offset,
+                    int stripe_count, int stripe_pattern, char *pool_name,
+                    lustre_fid *newfid)
+{
+       struct utimbuf  time;
+       int             fd;
+       int             rc = 0;
+
+       /* Create a non-striped file */
+       fd = open(dst, O_CREAT | O_EXCL | O_LOV_DELAY_CREATE | O_NONBLOCK,
+                 st->st_mode);
+
+       if (fd < 0)
+               return -errno;
+       close(fd);
+
+       /* set size on MDT */
+       if (truncate(dst, st->st_size) != 0) {
+               rc = -errno;
+               goto out_unlink;
+       }
+       /* Mark archived */
+       rc = llapi_hsm_state_set(dst, HS_EXISTS | HS_RELEASED | HS_ARCHIVED, 0,
+                                archive);
+       if (rc)
+               goto out_unlink;
+
+       /* Get the new fid in the archive. Caller needs to use this fid
+          from now on. */
+       rc = llapi_path2fid(dst, newfid);
+       if (rc)
+               goto out_unlink;
+
+       /* Copy the file attributes */
+       time.actime = st->st_atime;
+       time.modtime = st->st_mtime;
+       if (utime(dst, &time) == -1 ||
+               chmod(dst, st->st_mode) == -1 ||
+               chown(dst, st->st_uid, st->st_gid) == -1) {
+               /* we might fail here because we change perms/owner */
+               rc = -errno;
+               goto out_unlink;
+       }
+
+out_unlink:
+       if (rc)
+               unlink(dst);
+       return rc;
+}
+
diff --git a/lustre/utils/lustreapi_internal.h b/lustre/utils/lustreapi_internal.h
new file mode 100644 (file)
index 0000000..3ae67e9
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * LGPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
+ *     alternatives
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 or (at your discretion) any later version.
+ * (LGPL) version 2.1 accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * LGPL HEADER END
+ */
+/*
+ *
+ * lustre/utils/lustreapi_internal.h
+ *
+ */
+/*
+ *
+ * Author: Aurelien Degremont <aurelien.degremont@cea.fr>
+ * Author: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
+ * Author: Thomas Leibovici <thomas.leibovici@cea.fr>
+ */
+
+#ifndef _LUSTREAPI_INTERNAL_H_
+#define _LUSTREAPI_INTERNAL_H_
+
+#define WANT_PATH   0x1
+#define WANT_FSNAME 0x2
+#define WANT_FD     0x4
+#define WANT_INDEX  0x8
+#define WANT_ERROR  0x10
+int get_root_path(int want, char *fsname, int *outfd, char *path, int index);
+int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
+              int want_error);
+
+
+#endif /* _LUSTREAPI_INTERNAL_H_ */
index d893dc4..bcdf387 100644 (file)
@@ -83,6 +83,8 @@
 #define lustre_swab_mgs_config_body NULL
 #define lustre_swab_mgs_config_res NULL
 #define lustre_swab_lu_fid NULL
+#define lustre_swab_hsm_progress_kernel NULL
+#define lustre_swab_hsm_user_item NULL
 #define dump_rniobuf NULL
 #define dump_ioo NULL
 #define dump_obdo NULL
index faba586..03aa467 100644 (file)
 #include <lustre/lustre_idl.h>
 #include <lustre_disk.h>
 
-#define BLANK_LINE()                                            \
-do {                                                            \
-        printf("\n");                                           \
+#define BLANK_LINE()                                           \
+do {                                                           \
+       printf("\n");                                           \
 } while(0)
 
-#define COMMENT(c)                                              \
-do {                                                            \
-        printf("        /* "c" */\n");                          \
+#define COMMENT(c)                                             \
+do {                                                           \
+       printf("        /* "c" */\n");                          \
 } while(0)
 
 #define STRINGIFY(a) #a
 
-#define CHECK_CDEFINE(a)                                        \
-        printf("        CLASSERT("#a" == "STRINGIFY(a) ");\n")
+#define CHECK_CDEFINE(a)                                       \
+       printf("        CLASSERT("#a" == "STRINGIFY(a) ");\n")
 
-#define CHECK_CVALUE(a)                                         \
-        printf("        CLASSERT("#a" == %lld);\n", (long long)a)
+#define CHECK_CVALUE(a)                                         \
+       printf("        CLASSERT("#a" == %lld);\n", (long long)a)
 
-#define CHECK_CVALUE_X(a)                                       \
-        printf("        CLASSERT("#a" == 0x%.8x);\n", a)
+#define CHECK_CVALUE_X(a)                                      \
+       printf("        CLASSERT("#a" == 0x%.8x);\n", a)
 
-#define CHECK_DEFINE(a)                                         \
-do {                                                            \
-        printf("        LASSERTF("#a" == "STRINGIFY(a)          \
-               ", \"found %%lld\\n\",\n                 "       \
-               "(long long)"#a");\n");                          \
+#define CHECK_DEFINE(a)                                                \
+do {                                                           \
+       printf("        LASSERTF("#a" == "STRINGIFY(a)          \
+               ", \"found %%lld\\n\",\n                        "\
+               "(long long)"#a");\n");                         \
 } while(0)
 
-#define CHECK_DEFINE_X(a)                                       \
-do {                                                            \
-        printf("        LASSERTF("#a" == "STRINGIFY(a)          \
-               ", \"found 0x%%.8x\\n\",\n                 "#a   \
-               ");\n");                                         \
+#define CHECK_DEFINE_X(a)                                      \
+do {                                                           \
+       printf("        LASSERTF("#a" == "STRINGIFY(a)          \
+               ", \"found 0x%%.8x\\n\",\n              "#a     \
+               ");\n");                                        \
 } while(0)
 
-#define CHECK_DEFINE_64X(a)                                     \
-do {                                                            \
-        printf("        LASSERTF("#a" == "STRINGIFY(a)          \
-               ", \"found 0x%%.16llxULL\\n\",\n                "\
-               " "#a");\n");                                    \
+#define CHECK_DEFINE_64X(a)                                    \
+do {                                                           \
+       printf("        LASSERTF("#a" == "STRINGIFY(a)          \
+               ", \"found 0x%%.16llxULL\\n\",\n                "\
+               " "#a");\n");                                   \
 } while(0)
 
-#define CHECK_VALUE(a)                                          \
-do {                                                            \
-        printf("        LASSERTF("#a                            \
-               " == %lld, \"found %%lld\\n\",\n                "\
-               " (long long)"#a");\n", (long long)a);           \
+#define CHECK_VALUE(a)                                         \
+do {                                                           \
+       printf("        LASSERTF("#a                            \
+               " == %lld, \"found %%lld\\n\",\n                "\
+               " (long long)"#a");\n", (long long)a);          \
 } while(0)
 
-#define CHECK_VALUE_X(a)                                        \
-do {                                                            \
-        printf("        LASSERTF("#a                            \
-               " == 0x%.8xUL, \"found 0x%%.8xUL\\n\",\n        "\
-               "         (unsigned)"#a");\n", (unsigned)a);     \
+#define CHECK_VALUE_X(a)                                       \
+do {                                                           \
+       printf("        LASSERTF("#a                            \
+               " == 0x%.8xUL, \"found 0x%%.8xUL\\n\",\n        "\
+               "       (unsigned)"#a");\n", (unsigned)a);      \
 } while(0)
 
-#define CHECK_VALUE_O(a)                                        \
-do {                                                            \
-        printf("        LASSERTF("#a                            \
-               " == 0%.11oUL, \"found 0%%.11oUL\\n\",\n        "\
-               "         "#a");\n", a);                         \
+#define CHECK_VALUE_O(a)                                       \
+do {                                                           \
+       printf("        LASSERTF("#a                            \
+               " == 0%.11oUL, \"found 0%%.11oUL\\n\",\n        "\
+               "       "#a");\n", a);                          \
 } while(0)
 
-#define CHECK_VALUE_64X(a)                                      \
-do {                                                            \
-        printf("        LASSERTF("#a" == 0x%.16llxULL, "        \
-               "\"found 0x%%.16llxULL\\n\",\n                 \
-               "(long long)"#a");\n", (long long)a);            \
+#define CHECK_VALUE_64X(a)                                     \
+do {                                                           \
+       printf("        LASSERTF("#a" == 0x%.16llxULL, "        \
+               "\"found 0x%%.16llxULL\\n\",\n                  "\
+               "(long long)"#a");\n", (long long)a);           \
 } while(0)
 
-#define CHECK_VALUE_64O(a)                                      \
-do {                                                            \
-        printf("        LASSERTF("#a" == 0%.22lloULL, "         \
-               "\"found 0%%.22lloULL\\n\",\n                 "  \
-               "(long long)"#a");\n", (long long)a);            \
+#define CHECK_VALUE_64O(a)                                     \
+do {                                                           \
+       printf("        LASSERTF("#a" == 0%.22lloULL, "         \
+               "\"found 0%%.22lloULL\\n\",\n                   "\
+               "(long long)"#a");\n", (long long)a);           \
 } while(0)
 
-#define CHECK_MEMBER_OFFSET(s,m)                                \
-do {                                                            \
-        CHECK_VALUE((int)offsetof(struct s, m));                \
+#define CHECK_MEMBER_OFFSET(s, m)                              \
+do {                                                           \
+       CHECK_VALUE((int)offsetof(struct s, m));                \
 } while(0)
 
-#define CHECK_MEMBER_OFFSET_TYPEDEF(s,m)                        \
-do {                                                            \
-        CHECK_VALUE((int)offsetof(s, m));                       \
+#define CHECK_MEMBER_OFFSET_TYPEDEF(s, m)                      \
+do {                                                           \
+       CHECK_VALUE((int)offsetof(s, m));                       \
 } while(0)
 
-#define CHECK_MEMBER_SIZEOF(s,m)                                \
-do {                                                            \
-        CHECK_VALUE((int)sizeof(((struct s *)0)->m));           \
+#define CHECK_MEMBER_SIZEOF(s, m)                              \
+do {                                                           \
+       CHECK_VALUE((int)sizeof(((struct s *)0)->m));           \
 } while(0)
 
-#define CHECK_MEMBER_SIZEOF_TYPEDEF(s,m)                        \
-do {                                                            \
-        CHECK_VALUE((int)sizeof(((s *)0)->m));                  \
+#define CHECK_MEMBER_SIZEOF_TYPEDEF(s, m)                      \
+do {                                                           \
+       CHECK_VALUE((int)sizeof(((s *)0)->m));                  \
 } while(0)
 
-#define CHECK_MEMBER(s,m)                                       \
-do {                                                            \
-        CHECK_MEMBER_OFFSET(s, m);                              \
-        CHECK_MEMBER_SIZEOF(s, m);                              \
+#define CHECK_MEMBER(s, m)                                     \
+do {                                                           \
+       CHECK_MEMBER_OFFSET(s, m);                              \
+       CHECK_MEMBER_SIZEOF(s, m);                              \
 } while(0)
 
-#define CHECK_MEMBER_TYPEDEF(s,m)                               \
-do {                                                            \
-        CHECK_MEMBER_OFFSET_TYPEDEF(s, m);                      \
-        CHECK_MEMBER_SIZEOF_TYPEDEF(s, m);                      \
+#define CHECK_MEMBER_TYPEDEF(s, m)                             \
+do {                                                           \
+       CHECK_MEMBER_OFFSET_TYPEDEF(s, m);                      \
+       CHECK_MEMBER_SIZEOF_TYPEDEF(s, m);                      \
 } while(0)
 
-#define CHECK_STRUCT(s)                                         \
-do {                                                            \
-        COMMENT("Checks for struct "#s);                        \
-                CHECK_VALUE((int)sizeof(struct s));             \
+#define CHECK_STRUCT(s)                                                \
+do {                                                           \
+       COMMENT("Checks for struct "#s);                        \
+               CHECK_VALUE((int)sizeof(struct s));             \
 } while(0)
 
-#define CHECK_STRUCT_TYPEDEF(s)                                 \
-do {                                                            \
-        COMMENT("Checks for type "#s);                          \
-                CHECK_VALUE((int)sizeof(s));                    \
+#define CHECK_STRUCT_TYPEDEF(s)                                        \
+do {                                                           \
+       COMMENT("Checks for type "#s);                          \
+               CHECK_VALUE((int)sizeof(s));                    \
 } while(0)
 
 #define CHECK_UNION(s)                                         \
@@ -169,51 +169,48 @@ do {                                                              \
        CHECK_VALUE((int)sizeof(union s));                      \
 } while(0)
 
-#define CHECK_VALUE_SAME(v1, v2)                                \
-do {                                                            \
-       printf("\tLASSERTF("#v1" == "#v2", "                    \
-              "\"%%d != %%d\\n\",\n"                           \
-              "\t\t "#v1", "#v2");\n");                        \
+#define CHECK_VALUE_SAME(v1, v2)                               \
+do {                                                           \
+       printf("\tLASSERTF("#v1" == "#v2", "                    \
+               "\"%%d != %%d\\n\",\n"                          \
+               "\t\t "#v1", "#v2");\n");                       \
 } while (0)
 
-#define CHECK_MEMBER_SAME(s1, s2, m)                            \
-do {                                                            \
-       CHECK_VALUE_SAME((int)offsetof(struct s1, m),           \
-                        (int)offsetof(struct s2, m));          \
-       CHECK_VALUE_SAME((int)sizeof(((struct s1 *)0)->m),      \
-                        (int)sizeof(((struct s2 *)0)->m));     \
+#define CHECK_MEMBER_SAME(s1, s2, m)                           \
+do {                                                           \
+       CHECK_VALUE_SAME((int)offsetof(struct s1, m),           \
+                        (int)offsetof(struct s2, m));          \
+       CHECK_VALUE_SAME((int)sizeof(((struct s1 *)0)->m),      \
+                        (int)sizeof(((struct s2 *)0)->m));     \
 } while (0)
 
 static void
 check_lu_seq_range(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lu_seq_range);
-        CHECK_MEMBER(lu_seq_range, lsr_start);
-        CHECK_MEMBER(lu_seq_range, lsr_end);
-        CHECK_MEMBER(lu_seq_range, lsr_index);
-        CHECK_MEMBER(lu_seq_range, lsr_flags);
+       BLANK_LINE();
+       CHECK_STRUCT(lu_seq_range);
+       CHECK_MEMBER(lu_seq_range, lsr_start);
+       CHECK_MEMBER(lu_seq_range, lsr_end);
+       CHECK_MEMBER(lu_seq_range, lsr_index);
+       CHECK_MEMBER(lu_seq_range, lsr_flags);
 
-        CHECK_VALUE(LU_SEQ_RANGE_MDT);
-        CHECK_VALUE(LU_SEQ_RANGE_OST);
+       CHECK_VALUE(LU_SEQ_RANGE_MDT);
+       CHECK_VALUE(LU_SEQ_RANGE_OST);
 }
 
 static void
 check_lustre_mdt_attrs(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lustre_mdt_attrs);
-        CHECK_MEMBER(lustre_mdt_attrs, lma_compat);
-        CHECK_MEMBER(lustre_mdt_attrs, lma_incompat);
-        CHECK_MEMBER(lustre_mdt_attrs, lma_self_fid);
-        CHECK_MEMBER(lustre_mdt_attrs, lma_flags);
-
-        CHECK_DEFINE(LMA_INCOMPAT_SUPP);
-
+       BLANK_LINE();
+       CHECK_STRUCT(lustre_mdt_attrs);
+       CHECK_MEMBER(lustre_mdt_attrs, lma_compat);
+       CHECK_MEMBER(lustre_mdt_attrs, lma_incompat);
+       CHECK_MEMBER(lustre_mdt_attrs, lma_self_fid);
+       CHECK_MEMBER(lustre_mdt_attrs, lma_flags);
        CHECK_VALUE_X(LMAI_RELEASED);
 
-        CHECK_VALUE_X(LMAC_HSM);
-        CHECK_VALUE_X(LMAC_SOM);
+       CHECK_VALUE_X(LMAC_HSM);
+       CHECK_VALUE_X(LMAC_SOM);
 }
 
 static void
@@ -243,130 +240,130 @@ check_hsm_attrs(void)
 static void
 check_ost_id(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ost_id);
-        CHECK_MEMBER(ost_id, oi_id);
-        CHECK_MEMBER(ost_id, oi_seq);
-
-        CHECK_VALUE(LUSTRE_FID_INIT_OID);
-
-        CHECK_VALUE(FID_SEQ_OST_MDT0);
-        CHECK_VALUE(FID_SEQ_LLOG);
-        CHECK_VALUE(FID_SEQ_ECHO);
-        CHECK_VALUE(FID_SEQ_OST_MDT1);
-        CHECK_VALUE(FID_SEQ_OST_MAX);
-        CHECK_VALUE(FID_SEQ_RSVD);
-        CHECK_VALUE(FID_SEQ_IGIF);
-        CHECK_VALUE_64X(FID_SEQ_IGIF_MAX);
-        CHECK_VALUE_64X(FID_SEQ_IDIF);
-        CHECK_VALUE_64X(FID_SEQ_IDIF_MAX);
-        CHECK_VALUE_64X(FID_SEQ_START);
-        CHECK_VALUE_64X(FID_SEQ_LOCAL_FILE);
-        CHECK_VALUE_64X(FID_SEQ_DOT_LUSTRE);
-        CHECK_VALUE_64X(FID_SEQ_SPECIAL);
-        CHECK_VALUE_64X(FID_SEQ_QUOTA);
-        CHECK_VALUE_64X(FID_SEQ_QUOTA_GLB);
-        CHECK_VALUE_64X(FID_SEQ_NORMAL);
-        CHECK_VALUE_64X(FID_SEQ_LOV_DEFAULT);
-
-        CHECK_VALUE_X(FID_OID_SPECIAL_BFL);
-        CHECK_VALUE_X(FID_OID_DOT_LUSTRE);
-        CHECK_VALUE_X(FID_OID_DOT_LUSTRE_OBF);
+       BLANK_LINE();
+       CHECK_STRUCT(ost_id);
+       CHECK_MEMBER(ost_id, oi_id);
+       CHECK_MEMBER(ost_id, oi_seq);
+
+       CHECK_VALUE(LUSTRE_FID_INIT_OID);
+
+       CHECK_VALUE(FID_SEQ_OST_MDT0);
+       CHECK_VALUE(FID_SEQ_LLOG);
+       CHECK_VALUE(FID_SEQ_ECHO);
+       CHECK_VALUE(FID_SEQ_OST_MDT1);
+       CHECK_VALUE(FID_SEQ_OST_MAX);
+       CHECK_VALUE(FID_SEQ_RSVD);
+       CHECK_VALUE(FID_SEQ_IGIF);
+       CHECK_VALUE_64X(FID_SEQ_IGIF_MAX);
+       CHECK_VALUE_64X(FID_SEQ_IDIF);
+       CHECK_VALUE_64X(FID_SEQ_IDIF_MAX);
+       CHECK_VALUE_64X(FID_SEQ_START);
+       CHECK_VALUE_64X(FID_SEQ_LOCAL_FILE);
+       CHECK_VALUE_64X(FID_SEQ_DOT_LUSTRE);
+       CHECK_VALUE_64X(FID_SEQ_SPECIAL);
+       CHECK_VALUE_64X(FID_SEQ_QUOTA);
+       CHECK_VALUE_64X(FID_SEQ_QUOTA_GLB);
+       CHECK_VALUE_64X(FID_SEQ_NORMAL);
+       CHECK_VALUE_64X(FID_SEQ_LOV_DEFAULT);
+
+       CHECK_VALUE_X(FID_OID_SPECIAL_BFL);
+       CHECK_VALUE_X(FID_OID_DOT_LUSTRE);
+       CHECK_VALUE_X(FID_OID_DOT_LUSTRE_OBF);
 }
 
 static void
 check_lu_dirent(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lu_dirent);
-        CHECK_MEMBER(lu_dirent, lde_fid);
-        CHECK_MEMBER(lu_dirent, lde_hash);
-        CHECK_MEMBER(lu_dirent, lde_reclen);
-        CHECK_MEMBER(lu_dirent, lde_namelen);
-        CHECK_MEMBER(lu_dirent, lde_attrs);
-        CHECK_MEMBER(lu_dirent, lde_name[0]);
+       BLANK_LINE();
+       CHECK_STRUCT(lu_dirent);
+       CHECK_MEMBER(lu_dirent, lde_fid);
+       CHECK_MEMBER(lu_dirent, lde_hash);
+       CHECK_MEMBER(lu_dirent, lde_reclen);
+       CHECK_MEMBER(lu_dirent, lde_namelen);
+       CHECK_MEMBER(lu_dirent, lde_attrs);
+       CHECK_MEMBER(lu_dirent, lde_name[0]);
 
-        CHECK_VALUE_X(LUDA_FID);
-        CHECK_VALUE_X(LUDA_TYPE);
-        CHECK_VALUE_X(LUDA_64BITHASH);
+       CHECK_VALUE_X(LUDA_FID);
+       CHECK_VALUE_X(LUDA_TYPE);
+       CHECK_VALUE_X(LUDA_64BITHASH);
 }
 
 static void
 check_luda_type(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(luda_type);
-        CHECK_MEMBER(luda_type, lt_type);
+       BLANK_LINE();
+       CHECK_STRUCT(luda_type);
+       CHECK_MEMBER(luda_type, lt_type);
 }
 
 static void
 check_lu_dirpage(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lu_dirpage);
-        CHECK_MEMBER(lu_dirpage, ldp_hash_start);
-        CHECK_MEMBER(lu_dirpage, ldp_hash_end);
-        CHECK_MEMBER(lu_dirpage, ldp_flags);
-        CHECK_MEMBER(lu_dirpage, ldp_pad0);
-        CHECK_MEMBER(lu_dirpage, ldp_entries[0]);
-
-        CHECK_VALUE(LDF_EMPTY);
-        CHECK_VALUE(LDF_COLLIDE);
-        CHECK_VALUE(LU_PAGE_SIZE);
+       BLANK_LINE();
+       CHECK_STRUCT(lu_dirpage);
+       CHECK_MEMBER(lu_dirpage, ldp_hash_start);
+       CHECK_MEMBER(lu_dirpage, ldp_hash_end);
+       CHECK_MEMBER(lu_dirpage, ldp_flags);
+       CHECK_MEMBER(lu_dirpage, ldp_pad0);
+       CHECK_MEMBER(lu_dirpage, ldp_entries[0]);
+
+       CHECK_VALUE(LDF_EMPTY);
+       CHECK_VALUE(LDF_COLLIDE);
+       CHECK_VALUE(LU_PAGE_SIZE);
        CHECK_UNION(lu_page);
 }
 
 static void
 check_lustre_handle(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lustre_handle);
-        CHECK_MEMBER(lustre_handle, cookie);
+       BLANK_LINE();
+       CHECK_STRUCT(lustre_handle);
+       CHECK_MEMBER(lustre_handle, cookie);
 }
 
 static void
 check_lustre_msg_v2(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lustre_msg_v2);
-        CHECK_MEMBER(lustre_msg_v2, lm_bufcount);
-        CHECK_MEMBER(lustre_msg_v2, lm_secflvr);
-        CHECK_MEMBER(lustre_msg_v2, lm_magic);
-        CHECK_MEMBER(lustre_msg_v2, lm_repsize);
-        CHECK_MEMBER(lustre_msg_v2, lm_cksum);
-        CHECK_MEMBER(lustre_msg_v2, lm_flags);
-        CHECK_MEMBER(lustre_msg_v2, lm_padding_2);
-        CHECK_MEMBER(lustre_msg_v2, lm_padding_3);
-        CHECK_MEMBER(lustre_msg_v2, lm_buflens[0]);
+       BLANK_LINE();
+       CHECK_STRUCT(lustre_msg_v2);
+       CHECK_MEMBER(lustre_msg_v2, lm_bufcount);
+       CHECK_MEMBER(lustre_msg_v2, lm_secflvr);
+       CHECK_MEMBER(lustre_msg_v2, lm_magic);
+       CHECK_MEMBER(lustre_msg_v2, lm_repsize);
+       CHECK_MEMBER(lustre_msg_v2, lm_cksum);
+       CHECK_MEMBER(lustre_msg_v2, lm_flags);
+       CHECK_MEMBER(lustre_msg_v2, lm_padding_2);
+       CHECK_MEMBER(lustre_msg_v2, lm_padding_3);
+       CHECK_MEMBER(lustre_msg_v2, lm_buflens[0]);
 
-        CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V1);
-        CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V2);
-        CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V1_SWABBED);
-        CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V2_SWABBED);
+       CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V1);
+       CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V2);
+       CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V1_SWABBED);
+       CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V2_SWABBED);
 }
 
 static void
 check_ptlrpc_body(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ptlrpc_body);
-        CHECK_MEMBER(ptlrpc_body, pb_handle);
-        CHECK_MEMBER(ptlrpc_body, pb_type);
-        CHECK_MEMBER(ptlrpc_body, pb_version);
-        CHECK_MEMBER(ptlrpc_body, pb_opc);
-        CHECK_MEMBER(ptlrpc_body, pb_status);
-        CHECK_MEMBER(ptlrpc_body, pb_last_xid);
-        CHECK_MEMBER(ptlrpc_body, pb_last_seen);
-        CHECK_MEMBER(ptlrpc_body, pb_last_committed);
-        CHECK_MEMBER(ptlrpc_body, pb_transno);
-        CHECK_MEMBER(ptlrpc_body, pb_flags);
-        CHECK_MEMBER(ptlrpc_body, pb_op_flags);
-        CHECK_MEMBER(ptlrpc_body, pb_conn_cnt);
-        CHECK_MEMBER(ptlrpc_body, pb_timeout);
-        CHECK_MEMBER(ptlrpc_body, pb_service_time);
-        CHECK_MEMBER(ptlrpc_body, pb_limit);
+       BLANK_LINE();
+       CHECK_STRUCT(ptlrpc_body);
+       CHECK_MEMBER(ptlrpc_body, pb_handle);
+       CHECK_MEMBER(ptlrpc_body, pb_type);
+       CHECK_MEMBER(ptlrpc_body, pb_version);
+       CHECK_MEMBER(ptlrpc_body, pb_opc);
+       CHECK_MEMBER(ptlrpc_body, pb_status);
+       CHECK_MEMBER(ptlrpc_body, pb_last_xid);
+       CHECK_MEMBER(ptlrpc_body, pb_last_seen);
+       CHECK_MEMBER(ptlrpc_body, pb_last_committed);
+       CHECK_MEMBER(ptlrpc_body, pb_transno);
+       CHECK_MEMBER(ptlrpc_body, pb_flags);
+       CHECK_MEMBER(ptlrpc_body, pb_op_flags);
+       CHECK_MEMBER(ptlrpc_body, pb_conn_cnt);
+       CHECK_MEMBER(ptlrpc_body, pb_timeout);
+       CHECK_MEMBER(ptlrpc_body, pb_service_time);
+       CHECK_MEMBER(ptlrpc_body, pb_limit);
        CHECK_MEMBER(ptlrpc_body, pb_slv);
-        CHECK_CVALUE(PTLRPC_NUM_VERSIONS);
+       CHECK_CVALUE(PTLRPC_NUM_VERSIONS);
        CHECK_MEMBER(ptlrpc_body, pb_pre_versions);
        CHECK_MEMBER(ptlrpc_body, pb_padding);
        CHECK_CVALUE(JOBSTATS_JOBID_SIZE);
@@ -391,336 +388,336 @@ check_ptlrpc_body(void)
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_pre_versions);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_padding);
 
-        CHECK_VALUE(MSG_PTLRPC_BODY_OFF);
-        CHECK_VALUE(REQ_REC_OFF);
-        CHECK_VALUE(REPLY_REC_OFF);
-        CHECK_VALUE(DLM_LOCKREQ_OFF);
-        CHECK_VALUE(DLM_REQ_REC_OFF);
-        CHECK_VALUE(DLM_INTENT_IT_OFF);
-        CHECK_VALUE(DLM_INTENT_REC_OFF);
-        CHECK_VALUE(DLM_LOCKREPLY_OFF);
-        CHECK_VALUE(DLM_REPLY_REC_OFF);
-        CHECK_VALUE(MSG_PTLRPC_HEADER_OFF);
-
-        CHECK_DEFINE_X(PTLRPC_MSG_VERSION);
-        CHECK_DEFINE_X(LUSTRE_VERSION_MASK);
-        CHECK_DEFINE_X(LUSTRE_OBD_VERSION);
-        CHECK_DEFINE_X(LUSTRE_MDS_VERSION);
-        CHECK_DEFINE_X(LUSTRE_OST_VERSION);
-        CHECK_DEFINE_X(LUSTRE_DLM_VERSION);
-        CHECK_DEFINE_X(LUSTRE_LOG_VERSION);
-        CHECK_DEFINE_X(LUSTRE_MGS_VERSION);
-
-        CHECK_VALUE(MSGHDR_AT_SUPPORT);
-        CHECK_VALUE(MSGHDR_CKSUM_INCOMPAT18);
-
-        CHECK_VALUE_X(MSG_OP_FLAG_MASK);
-        CHECK_VALUE(MSG_OP_FLAG_SHIFT);
-        CHECK_VALUE_X(MSG_GEN_FLAG_MASK);
-
-        CHECK_VALUE_X(MSG_LAST_REPLAY);
-        CHECK_VALUE_X(MSG_RESENT);
-        CHECK_VALUE_X(MSG_REPLAY);
-        CHECK_VALUE_X(MSG_DELAY_REPLAY);
-        CHECK_VALUE_X(MSG_VERSION_REPLAY);
-        CHECK_VALUE_X(MSG_REQ_REPLAY_DONE);
-        CHECK_VALUE_X(MSG_LOCK_REPLAY_DONE);
-
-        CHECK_VALUE_X(MSG_CONNECT_RECOVERING);
-        CHECK_VALUE_X(MSG_CONNECT_RECONNECT);
-        CHECK_VALUE_X(MSG_CONNECT_REPLAYABLE);
-        CHECK_VALUE_X(MSG_CONNECT_LIBCLIENT);
-        CHECK_VALUE_X(MSG_CONNECT_INITIAL);
-        CHECK_VALUE_X(MSG_CONNECT_ASYNC);
-        CHECK_VALUE_X(MSG_CONNECT_NEXT_VER);
-        CHECK_VALUE_X(MSG_CONNECT_TRANSNO);
+       CHECK_VALUE(MSG_PTLRPC_BODY_OFF);
+       CHECK_VALUE(REQ_REC_OFF);
+       CHECK_VALUE(REPLY_REC_OFF);
+       CHECK_VALUE(DLM_LOCKREQ_OFF);
+       CHECK_VALUE(DLM_REQ_REC_OFF);
+       CHECK_VALUE(DLM_INTENT_IT_OFF);
+       CHECK_VALUE(DLM_INTENT_REC_OFF);
+       CHECK_VALUE(DLM_LOCKREPLY_OFF);
+       CHECK_VALUE(DLM_REPLY_REC_OFF);
+       CHECK_VALUE(MSG_PTLRPC_HEADER_OFF);
+
+       CHECK_DEFINE_X(PTLRPC_MSG_VERSION);
+       CHECK_DEFINE_X(LUSTRE_VERSION_MASK);
+       CHECK_DEFINE_X(LUSTRE_OBD_VERSION);
+       CHECK_DEFINE_X(LUSTRE_MDS_VERSION);
+       CHECK_DEFINE_X(LUSTRE_OST_VERSION);
+       CHECK_DEFINE_X(LUSTRE_DLM_VERSION);
+       CHECK_DEFINE_X(LUSTRE_LOG_VERSION);
+       CHECK_DEFINE_X(LUSTRE_MGS_VERSION);
+
+       CHECK_VALUE(MSGHDR_AT_SUPPORT);
+       CHECK_VALUE(MSGHDR_CKSUM_INCOMPAT18);
+
+       CHECK_VALUE_X(MSG_OP_FLAG_MASK);
+       CHECK_VALUE(MSG_OP_FLAG_SHIFT);
+       CHECK_VALUE_X(MSG_GEN_FLAG_MASK);
+
+       CHECK_VALUE_X(MSG_LAST_REPLAY);
+       CHECK_VALUE_X(MSG_RESENT);
+       CHECK_VALUE_X(MSG_REPLAY);
+       CHECK_VALUE_X(MSG_DELAY_REPLAY);
+       CHECK_VALUE_X(MSG_VERSION_REPLAY);
+       CHECK_VALUE_X(MSG_REQ_REPLAY_DONE);
+       CHECK_VALUE_X(MSG_LOCK_REPLAY_DONE);
+
+       CHECK_VALUE_X(MSG_CONNECT_RECOVERING);
+       CHECK_VALUE_X(MSG_CONNECT_RECONNECT);
+       CHECK_VALUE_X(MSG_CONNECT_REPLAYABLE);
+       CHECK_VALUE_X(MSG_CONNECT_LIBCLIENT);
+       CHECK_VALUE_X(MSG_CONNECT_INITIAL);
+       CHECK_VALUE_X(MSG_CONNECT_ASYNC);
+       CHECK_VALUE_X(MSG_CONNECT_NEXT_VER);
+       CHECK_VALUE_X(MSG_CONNECT_TRANSNO);
 }
 
 static void
 check_obd_connect_data(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(obd_connect_data);
-        CHECK_MEMBER(obd_connect_data, ocd_connect_flags);
-        CHECK_MEMBER(obd_connect_data, ocd_version);
-        CHECK_MEMBER(obd_connect_data, ocd_grant);
-        CHECK_MEMBER(obd_connect_data, ocd_index);
-        CHECK_MEMBER(obd_connect_data, ocd_brw_size);
-        CHECK_MEMBER(obd_connect_data, ocd_ibits_known);
-        CHECK_MEMBER(obd_connect_data, ocd_blocksize);
-        CHECK_MEMBER(obd_connect_data, ocd_inodespace);
-        CHECK_MEMBER(obd_connect_data, ocd_grant_extent);
-        CHECK_MEMBER(obd_connect_data, ocd_unused);
-        CHECK_MEMBER(obd_connect_data, ocd_transno);
-        CHECK_MEMBER(obd_connect_data, ocd_group);
-        CHECK_MEMBER(obd_connect_data, ocd_cksum_types);
-        CHECK_MEMBER(obd_connect_data, ocd_max_easize);
-        CHECK_MEMBER(obd_connect_data, ocd_instance);
-        CHECK_MEMBER(obd_connect_data, ocd_maxbytes);
-        CHECK_MEMBER(obd_connect_data, padding1);
-        CHECK_MEMBER(obd_connect_data, padding2);
-        CHECK_MEMBER(obd_connect_data, padding3);
-        CHECK_MEMBER(obd_connect_data, padding4);
-        CHECK_MEMBER(obd_connect_data, padding5);
-        CHECK_MEMBER(obd_connect_data, padding6);
-        CHECK_MEMBER(obd_connect_data, padding7);
-        CHECK_MEMBER(obd_connect_data, padding8);
-        CHECK_MEMBER(obd_connect_data, padding9);
-        CHECK_MEMBER(obd_connect_data, paddingA);
-        CHECK_MEMBER(obd_connect_data, paddingB);
-        CHECK_MEMBER(obd_connect_data, paddingC);
-        CHECK_MEMBER(obd_connect_data, paddingD);
-        CHECK_MEMBER(obd_connect_data, paddingE);
-        CHECK_MEMBER(obd_connect_data, paddingF);
-
-        CHECK_DEFINE_64X(OBD_CONNECT_RDONLY);
-        CHECK_DEFINE_64X(OBD_CONNECT_INDEX);
-        CHECK_DEFINE_64X(OBD_CONNECT_MDS);
-        CHECK_DEFINE_64X(OBD_CONNECT_GRANT);
-        CHECK_DEFINE_64X(OBD_CONNECT_SRVLOCK);
-        CHECK_DEFINE_64X(OBD_CONNECT_VERSION);
-        CHECK_DEFINE_64X(OBD_CONNECT_REQPORTAL);
-        CHECK_DEFINE_64X(OBD_CONNECT_ACL);
-        CHECK_DEFINE_64X(OBD_CONNECT_XATTR);
-        CHECK_DEFINE_64X(OBD_CONNECT_CROW);
-        CHECK_DEFINE_64X(OBD_CONNECT_TRUNCLOCK);
-        CHECK_DEFINE_64X(OBD_CONNECT_TRANSNO);
-        CHECK_DEFINE_64X(OBD_CONNECT_IBITS);
-        CHECK_DEFINE_64X(OBD_CONNECT_JOIN);
-        CHECK_DEFINE_64X(OBD_CONNECT_ATTRFID);
-        CHECK_DEFINE_64X(OBD_CONNECT_NODEVOH);
-        CHECK_DEFINE_64X(OBD_CONNECT_RMT_CLIENT);
-        CHECK_DEFINE_64X(OBD_CONNECT_RMT_CLIENT_FORCE);
-        CHECK_DEFINE_64X(OBD_CONNECT_BRW_SIZE);
-        CHECK_DEFINE_64X(OBD_CONNECT_QUOTA64);
-        CHECK_DEFINE_64X(OBD_CONNECT_MDS_CAPA);
-        CHECK_DEFINE_64X(OBD_CONNECT_OSS_CAPA);
-        CHECK_DEFINE_64X(OBD_CONNECT_CANCELSET);
-        CHECK_DEFINE_64X(OBD_CONNECT_SOM);
-        CHECK_DEFINE_64X(OBD_CONNECT_AT);
-        CHECK_DEFINE_64X(OBD_CONNECT_LRU_RESIZE);
-        CHECK_DEFINE_64X(OBD_CONNECT_MDS_MDS);
-        CHECK_DEFINE_64X(OBD_CONNECT_REAL);
-        CHECK_DEFINE_64X(OBD_CONNECT_CHANGE_QS);
-        CHECK_DEFINE_64X(OBD_CONNECT_CKSUM);
-        CHECK_DEFINE_64X(OBD_CONNECT_FID);
-        CHECK_DEFINE_64X(OBD_CONNECT_VBR);
-        CHECK_DEFINE_64X(OBD_CONNECT_LOV_V3);
-        CHECK_DEFINE_64X(OBD_CONNECT_GRANT_SHRINK);
-        CHECK_DEFINE_64X(OBD_CONNECT_SKIP_ORPHAN);
-        CHECK_DEFINE_64X(OBD_CONNECT_MAX_EASIZE);
-        CHECK_DEFINE_64X(OBD_CONNECT_FULL20);
-        CHECK_DEFINE_64X(OBD_CONNECT_LAYOUTLOCK);
-        CHECK_DEFINE_64X(OBD_CONNECT_64BITHASH);
-        CHECK_DEFINE_64X(OBD_CONNECT_MAXBYTES);
-        CHECK_DEFINE_64X(OBD_CONNECT_IMP_RECOV);
-        CHECK_DEFINE_64X(OBD_CONNECT_JOBSTATS);
-        CHECK_DEFINE_64X(OBD_CONNECT_UMASK);
-        CHECK_DEFINE_64X(OBD_CONNECT_EINPROGRESS);
-        CHECK_DEFINE_64X(OBD_CONNECT_GRANT_PARAM);
-        CHECK_DEFINE_64X(OBD_CONNECT_FLOCK_OWNER);
+       BLANK_LINE();
+       CHECK_STRUCT(obd_connect_data);
+       CHECK_MEMBER(obd_connect_data, ocd_connect_flags);
+       CHECK_MEMBER(obd_connect_data, ocd_version);
+       CHECK_MEMBER(obd_connect_data, ocd_grant);
+       CHECK_MEMBER(obd_connect_data, ocd_index);
+       CHECK_MEMBER(obd_connect_data, ocd_brw_size);
+       CHECK_MEMBER(obd_connect_data, ocd_ibits_known);
+       CHECK_MEMBER(obd_connect_data, ocd_blocksize);
+       CHECK_MEMBER(obd_connect_data, ocd_inodespace);
+       CHECK_MEMBER(obd_connect_data, ocd_grant_extent);
+       CHECK_MEMBER(obd_connect_data, ocd_unused);
+       CHECK_MEMBER(obd_connect_data, ocd_transno);
+       CHECK_MEMBER(obd_connect_data, ocd_group);
+       CHECK_MEMBER(obd_connect_data, ocd_cksum_types);
+       CHECK_MEMBER(obd_connect_data, ocd_max_easize);
+       CHECK_MEMBER(obd_connect_data, ocd_instance);
+       CHECK_MEMBER(obd_connect_data, ocd_maxbytes);
+       CHECK_MEMBER(obd_connect_data, padding1);
+       CHECK_MEMBER(obd_connect_data, padding2);
+       CHECK_MEMBER(obd_connect_data, padding3);
+       CHECK_MEMBER(obd_connect_data, padding4);
+       CHECK_MEMBER(obd_connect_data, padding5);
+       CHECK_MEMBER(obd_connect_data, padding6);
+       CHECK_MEMBER(obd_connect_data, padding7);
+       CHECK_MEMBER(obd_connect_data, padding8);
+       CHECK_MEMBER(obd_connect_data, padding9);
+       CHECK_MEMBER(obd_connect_data, paddingA);
+       CHECK_MEMBER(obd_connect_data, paddingB);
+       CHECK_MEMBER(obd_connect_data, paddingC);
+       CHECK_MEMBER(obd_connect_data, paddingD);
+       CHECK_MEMBER(obd_connect_data, paddingE);
+       CHECK_MEMBER(obd_connect_data, paddingF);
+
+       CHECK_DEFINE_64X(OBD_CONNECT_RDONLY);
+       CHECK_DEFINE_64X(OBD_CONNECT_INDEX);
+       CHECK_DEFINE_64X(OBD_CONNECT_MDS);
+       CHECK_DEFINE_64X(OBD_CONNECT_GRANT);
+       CHECK_DEFINE_64X(OBD_CONNECT_SRVLOCK);
+       CHECK_DEFINE_64X(OBD_CONNECT_VERSION);
+       CHECK_DEFINE_64X(OBD_CONNECT_REQPORTAL);
+       CHECK_DEFINE_64X(OBD_CONNECT_ACL);
+       CHECK_DEFINE_64X(OBD_CONNECT_XATTR);
+       CHECK_DEFINE_64X(OBD_CONNECT_CROW);
+       CHECK_DEFINE_64X(OBD_CONNECT_TRUNCLOCK);
+       CHECK_DEFINE_64X(OBD_CONNECT_TRANSNO);
+       CHECK_DEFINE_64X(OBD_CONNECT_IBITS);
+       CHECK_DEFINE_64X(OBD_CONNECT_JOIN);
+       CHECK_DEFINE_64X(OBD_CONNECT_ATTRFID);
+       CHECK_DEFINE_64X(OBD_CONNECT_NODEVOH);
+       CHECK_DEFINE_64X(OBD_CONNECT_RMT_CLIENT);
+       CHECK_DEFINE_64X(OBD_CONNECT_RMT_CLIENT_FORCE);
+       CHECK_DEFINE_64X(OBD_CONNECT_BRW_SIZE);
+       CHECK_DEFINE_64X(OBD_CONNECT_QUOTA64);
+       CHECK_DEFINE_64X(OBD_CONNECT_MDS_CAPA);
+       CHECK_DEFINE_64X(OBD_CONNECT_OSS_CAPA);
+       CHECK_DEFINE_64X(OBD_CONNECT_CANCELSET);
+       CHECK_DEFINE_64X(OBD_CONNECT_SOM);
+       CHECK_DEFINE_64X(OBD_CONNECT_AT);
+       CHECK_DEFINE_64X(OBD_CONNECT_LRU_RESIZE);
+       CHECK_DEFINE_64X(OBD_CONNECT_MDS_MDS);
+       CHECK_DEFINE_64X(OBD_CONNECT_REAL);
+       CHECK_DEFINE_64X(OBD_CONNECT_CHANGE_QS);
+       CHECK_DEFINE_64X(OBD_CONNECT_CKSUM);
+       CHECK_DEFINE_64X(OBD_CONNECT_FID);
+       CHECK_DEFINE_64X(OBD_CONNECT_VBR);
+       CHECK_DEFINE_64X(OBD_CONNECT_LOV_V3);
+       CHECK_DEFINE_64X(OBD_CONNECT_GRANT_SHRINK);
+       CHECK_DEFINE_64X(OBD_CONNECT_SKIP_ORPHAN);
+       CHECK_DEFINE_64X(OBD_CONNECT_MAX_EASIZE);
+       CHECK_DEFINE_64X(OBD_CONNECT_FULL20);
+       CHECK_DEFINE_64X(OBD_CONNECT_LAYOUTLOCK);
+       CHECK_DEFINE_64X(OBD_CONNECT_64BITHASH);
+       CHECK_DEFINE_64X(OBD_CONNECT_MAXBYTES);
+       CHECK_DEFINE_64X(OBD_CONNECT_IMP_RECOV);
+       CHECK_DEFINE_64X(OBD_CONNECT_JOBSTATS);
+       CHECK_DEFINE_64X(OBD_CONNECT_UMASK);
+       CHECK_DEFINE_64X(OBD_CONNECT_EINPROGRESS);
+       CHECK_DEFINE_64X(OBD_CONNECT_GRANT_PARAM);
+       CHECK_DEFINE_64X(OBD_CONNECT_FLOCK_OWNER);
        CHECK_DEFINE_64X(OBD_CONNECT_LVB_TYPE);
        CHECK_DEFINE_64X(OBD_CONNECT_NANOSEC_TIME);
        CHECK_DEFINE_64X(OBD_CONNECT_LIGHTWEIGHT);
        CHECK_DEFINE_64X(OBD_CONNECT_SHORTIO);
 
-        CHECK_VALUE_X(OBD_CKSUM_CRC32);
-        CHECK_VALUE_X(OBD_CKSUM_ADLER);
-        CHECK_VALUE_X(OBD_CKSUM_CRC32C);
+       CHECK_VALUE_X(OBD_CKSUM_CRC32);
+       CHECK_VALUE_X(OBD_CKSUM_ADLER);
+       CHECK_VALUE_X(OBD_CKSUM_CRC32C);
 }
 
 static void
 check_obdo(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(obdo);
-        CHECK_MEMBER(obdo, o_valid);
-        CHECK_MEMBER(obdo, o_id);
-        CHECK_MEMBER(obdo, o_seq);
-        CHECK_MEMBER(obdo, o_parent_seq);
-        CHECK_MEMBER(obdo, o_size);
-        CHECK_MEMBER(obdo, o_mtime);
-        CHECK_MEMBER(obdo, o_atime);
-        CHECK_MEMBER(obdo, o_ctime);
-        CHECK_MEMBER(obdo, o_blocks);
-        CHECK_MEMBER(obdo, o_grant);
-        CHECK_MEMBER(obdo, o_blksize);
-        CHECK_MEMBER(obdo, o_mode);
-        CHECK_MEMBER(obdo, o_uid);
-        CHECK_MEMBER(obdo, o_gid);
-        CHECK_MEMBER(obdo, o_flags);
-        CHECK_MEMBER(obdo, o_nlink);
-        CHECK_MEMBER(obdo, o_parent_oid);
-        CHECK_MEMBER(obdo, o_misc);
-        CHECK_MEMBER(obdo, o_ioepoch);
-        CHECK_MEMBER(obdo, o_stripe_idx);
-        CHECK_MEMBER(obdo, o_parent_ver);
-        CHECK_MEMBER(obdo, o_handle);
-        CHECK_MEMBER(obdo, o_lcookie);
-        CHECK_MEMBER(obdo, o_uid_h);
-        CHECK_MEMBER(obdo, o_gid_h);
-        CHECK_MEMBER(obdo, o_data_version);
-        CHECK_MEMBER(obdo, o_padding_4);
-        CHECK_MEMBER(obdo, o_padding_5);
-        CHECK_MEMBER(obdo, o_padding_6);
-
-        CHECK_DEFINE_64X(OBD_MD_FLID);
-        CHECK_DEFINE_64X(OBD_MD_FLATIME);
-        CHECK_DEFINE_64X(OBD_MD_FLMTIME);
-        CHECK_DEFINE_64X(OBD_MD_FLCTIME);
-        CHECK_DEFINE_64X(OBD_MD_FLSIZE);
-        CHECK_DEFINE_64X(OBD_MD_FLBLOCKS);
-        CHECK_DEFINE_64X(OBD_MD_FLBLKSZ);
-        CHECK_DEFINE_64X(OBD_MD_FLMODE);
-        CHECK_DEFINE_64X(OBD_MD_FLTYPE);
-        CHECK_DEFINE_64X(OBD_MD_FLUID);
-        CHECK_DEFINE_64X(OBD_MD_FLGID);
-        CHECK_DEFINE_64X(OBD_MD_FLFLAGS);
-        CHECK_DEFINE_64X(OBD_MD_FLNLINK);
-        CHECK_DEFINE_64X(OBD_MD_FLGENER);
-        CHECK_DEFINE_64X(OBD_MD_FLRDEV);
-        CHECK_DEFINE_64X(OBD_MD_FLEASIZE);
-        CHECK_DEFINE_64X(OBD_MD_LINKNAME);
-        CHECK_DEFINE_64X(OBD_MD_FLHANDLE);
-        CHECK_DEFINE_64X(OBD_MD_FLCKSUM);
-        CHECK_DEFINE_64X(OBD_MD_FLQOS);
-        CHECK_DEFINE_64X(OBD_MD_FLCOOKIE);
-        CHECK_DEFINE_64X(OBD_MD_FLGROUP);
-        CHECK_DEFINE_64X(OBD_MD_FLFID);
-        CHECK_DEFINE_64X(OBD_MD_FLEPOCH);
-        CHECK_DEFINE_64X(OBD_MD_FLGRANT);
-        CHECK_DEFINE_64X(OBD_MD_FLDIREA);
-        CHECK_DEFINE_64X(OBD_MD_FLUSRQUOTA);
-        CHECK_DEFINE_64X(OBD_MD_FLGRPQUOTA);
-        CHECK_DEFINE_64X(OBD_MD_FLMODEASIZE);
-        CHECK_DEFINE_64X(OBD_MD_MDS);
-        CHECK_DEFINE_64X(OBD_MD_REINT);
-        CHECK_DEFINE_64X(OBD_MD_MEA);
-        CHECK_DEFINE_64X(OBD_MD_FLXATTR);
-        CHECK_DEFINE_64X(OBD_MD_FLXATTRLS);
-        CHECK_DEFINE_64X(OBD_MD_FLXATTRRM);
-        CHECK_DEFINE_64X(OBD_MD_FLACL);
-        CHECK_DEFINE_64X(OBD_MD_FLRMTPERM);
-        CHECK_DEFINE_64X(OBD_MD_FLMDSCAPA);
-        CHECK_DEFINE_64X(OBD_MD_FLOSSCAPA);
-        CHECK_DEFINE_64X(OBD_MD_FLCKSPLIT);
-        CHECK_DEFINE_64X(OBD_MD_FLCROSSREF);
-        CHECK_DEFINE_64X(OBD_MD_FLGETATTRLOCK);
-        CHECK_DEFINE_64X(OBD_MD_FLRMTLSETFACL);
-        CHECK_DEFINE_64X(OBD_MD_FLRMTLGETFACL);
-        CHECK_DEFINE_64X(OBD_MD_FLRMTRSETFACL);
-        CHECK_DEFINE_64X(OBD_MD_FLRMTRGETFACL);
-        CHECK_DEFINE_64X(OBD_MD_FLDATAVERSION);
-
-        CHECK_CVALUE_X(OBD_FL_INLINEDATA);
-        CHECK_CVALUE_X(OBD_FL_OBDMDEXISTS);
-        CHECK_CVALUE_X(OBD_FL_DELORPHAN);
-        CHECK_CVALUE_X(OBD_FL_NORPC);
-        CHECK_CVALUE_X(OBD_FL_IDONLY);
-        CHECK_CVALUE_X(OBD_FL_RECREATE_OBJS);
-        CHECK_CVALUE_X(OBD_FL_DEBUG_CHECK);
-        CHECK_CVALUE_X(OBD_FL_NO_USRQUOTA);
-        CHECK_CVALUE_X(OBD_FL_NO_GRPQUOTA);
-        CHECK_CVALUE_X(OBD_FL_CREATE_CROW);
-        CHECK_CVALUE_X(OBD_FL_SRVLOCK);
-        CHECK_CVALUE_X(OBD_FL_CKSUM_CRC32);
-        CHECK_CVALUE_X(OBD_FL_CKSUM_ADLER);
-        CHECK_CVALUE_X(OBD_FL_CKSUM_CRC32C);
-        CHECK_CVALUE_X(OBD_FL_CKSUM_RSVD2);
-        CHECK_CVALUE_X(OBD_FL_CKSUM_RSVD3);
-        CHECK_CVALUE_X(OBD_FL_SHRINK_GRANT);
-        CHECK_CVALUE_X(OBD_FL_MMAP);
-        CHECK_CVALUE_X(OBD_FL_RECOV_RESEND);
-        CHECK_CVALUE_X(OBD_FL_NOSPC_BLK);
-        CHECK_CVALUE_X(OBD_FL_LOCAL_MASK);
+       BLANK_LINE();
+       CHECK_STRUCT(obdo);
+       CHECK_MEMBER(obdo, o_valid);
+       CHECK_MEMBER(obdo, o_id);
+       CHECK_MEMBER(obdo, o_seq);
+       CHECK_MEMBER(obdo, o_parent_seq);
+       CHECK_MEMBER(obdo, o_size);
+       CHECK_MEMBER(obdo, o_mtime);
+       CHECK_MEMBER(obdo, o_atime);
+       CHECK_MEMBER(obdo, o_ctime);
+       CHECK_MEMBER(obdo, o_blocks);
+       CHECK_MEMBER(obdo, o_grant);
+       CHECK_MEMBER(obdo, o_blksize);
+       CHECK_MEMBER(obdo, o_mode);
+       CHECK_MEMBER(obdo, o_uid);
+       CHECK_MEMBER(obdo, o_gid);
+       CHECK_MEMBER(obdo, o_flags);
+       CHECK_MEMBER(obdo, o_nlink);
+       CHECK_MEMBER(obdo, o_parent_oid);
+       CHECK_MEMBER(obdo, o_misc);
+       CHECK_MEMBER(obdo, o_ioepoch);
+       CHECK_MEMBER(obdo, o_stripe_idx);
+       CHECK_MEMBER(obdo, o_parent_ver);
+       CHECK_MEMBER(obdo, o_handle);
+       CHECK_MEMBER(obdo, o_lcookie);
+       CHECK_MEMBER(obdo, o_uid_h);
+       CHECK_MEMBER(obdo, o_gid_h);
+       CHECK_MEMBER(obdo, o_data_version);
+       CHECK_MEMBER(obdo, o_padding_4);
+       CHECK_MEMBER(obdo, o_padding_5);
+       CHECK_MEMBER(obdo, o_padding_6);
+
+       CHECK_DEFINE_64X(OBD_MD_FLID);
+       CHECK_DEFINE_64X(OBD_MD_FLATIME);
+       CHECK_DEFINE_64X(OBD_MD_FLMTIME);
+       CHECK_DEFINE_64X(OBD_MD_FLCTIME);
+       CHECK_DEFINE_64X(OBD_MD_FLSIZE);
+       CHECK_DEFINE_64X(OBD_MD_FLBLOCKS);
+       CHECK_DEFINE_64X(OBD_MD_FLBLKSZ);
+       CHECK_DEFINE_64X(OBD_MD_FLMODE);
+       CHECK_DEFINE_64X(OBD_MD_FLTYPE);
+       CHECK_DEFINE_64X(OBD_MD_FLUID);
+       CHECK_DEFINE_64X(OBD_MD_FLGID);
+       CHECK_DEFINE_64X(OBD_MD_FLFLAGS);
+       CHECK_DEFINE_64X(OBD_MD_FLNLINK);
+       CHECK_DEFINE_64X(OBD_MD_FLGENER);
+       CHECK_DEFINE_64X(OBD_MD_FLRDEV);
+       CHECK_DEFINE_64X(OBD_MD_FLEASIZE);
+       CHECK_DEFINE_64X(OBD_MD_LINKNAME);
+       CHECK_DEFINE_64X(OBD_MD_FLHANDLE);
+       CHECK_DEFINE_64X(OBD_MD_FLCKSUM);
+       CHECK_DEFINE_64X(OBD_MD_FLQOS);
+       CHECK_DEFINE_64X(OBD_MD_FLCOOKIE);
+       CHECK_DEFINE_64X(OBD_MD_FLGROUP);
+       CHECK_DEFINE_64X(OBD_MD_FLFID);
+       CHECK_DEFINE_64X(OBD_MD_FLEPOCH);
+       CHECK_DEFINE_64X(OBD_MD_FLGRANT);
+       CHECK_DEFINE_64X(OBD_MD_FLDIREA);
+       CHECK_DEFINE_64X(OBD_MD_FLUSRQUOTA);
+       CHECK_DEFINE_64X(OBD_MD_FLGRPQUOTA);
+       CHECK_DEFINE_64X(OBD_MD_FLMODEASIZE);
+       CHECK_DEFINE_64X(OBD_MD_MDS);
+       CHECK_DEFINE_64X(OBD_MD_REINT);
+       CHECK_DEFINE_64X(OBD_MD_MEA);
+       CHECK_DEFINE_64X(OBD_MD_FLXATTR);
+       CHECK_DEFINE_64X(OBD_MD_FLXATTRLS);
+       CHECK_DEFINE_64X(OBD_MD_FLXATTRRM);
+       CHECK_DEFINE_64X(OBD_MD_FLACL);
+       CHECK_DEFINE_64X(OBD_MD_FLRMTPERM);
+       CHECK_DEFINE_64X(OBD_MD_FLMDSCAPA);
+       CHECK_DEFINE_64X(OBD_MD_FLOSSCAPA);
+       CHECK_DEFINE_64X(OBD_MD_FLCKSPLIT);
+       CHECK_DEFINE_64X(OBD_MD_FLCROSSREF);
+       CHECK_DEFINE_64X(OBD_MD_FLGETATTRLOCK);
+       CHECK_DEFINE_64X(OBD_MD_FLRMTLSETFACL);
+       CHECK_DEFINE_64X(OBD_MD_FLRMTLGETFACL);
+       CHECK_DEFINE_64X(OBD_MD_FLRMTRSETFACL);
+       CHECK_DEFINE_64X(OBD_MD_FLRMTRGETFACL);
+       CHECK_DEFINE_64X(OBD_MD_FLDATAVERSION);
+
+       CHECK_CVALUE_X(OBD_FL_INLINEDATA);
+       CHECK_CVALUE_X(OBD_FL_OBDMDEXISTS);
+       CHECK_CVALUE_X(OBD_FL_DELORPHAN);
+       CHECK_CVALUE_X(OBD_FL_NORPC);
+       CHECK_CVALUE_X(OBD_FL_IDONLY);
+       CHECK_CVALUE_X(OBD_FL_RECREATE_OBJS);
+       CHECK_CVALUE_X(OBD_FL_DEBUG_CHECK);
+       CHECK_CVALUE_X(OBD_FL_NO_USRQUOTA);
+       CHECK_CVALUE_X(OBD_FL_NO_GRPQUOTA);
+       CHECK_CVALUE_X(OBD_FL_CREATE_CROW);
+       CHECK_CVALUE_X(OBD_FL_SRVLOCK);
+       CHECK_CVALUE_X(OBD_FL_CKSUM_CRC32);
+       CHECK_CVALUE_X(OBD_FL_CKSUM_ADLER);
+       CHECK_CVALUE_X(OBD_FL_CKSUM_CRC32C);
+       CHECK_CVALUE_X(OBD_FL_CKSUM_RSVD2);
+       CHECK_CVALUE_X(OBD_FL_CKSUM_RSVD3);
+       CHECK_CVALUE_X(OBD_FL_SHRINK_GRANT);
+       CHECK_CVALUE_X(OBD_FL_MMAP);
+       CHECK_CVALUE_X(OBD_FL_RECOV_RESEND);
+       CHECK_CVALUE_X(OBD_FL_NOSPC_BLK);
+       CHECK_CVALUE_X(OBD_FL_LOCAL_MASK);
 }
 
 static void
 check_lov_ost_data_v1(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lov_ost_data_v1);
-        CHECK_MEMBER(lov_ost_data_v1, l_object_id);
-        CHECK_MEMBER(lov_ost_data_v1, l_object_seq);
-        CHECK_MEMBER(lov_ost_data_v1, l_ost_gen);
-        CHECK_MEMBER(lov_ost_data_v1, l_ost_idx);
+       BLANK_LINE();
+       CHECK_STRUCT(lov_ost_data_v1);
+       CHECK_MEMBER(lov_ost_data_v1, l_object_id);
+       CHECK_MEMBER(lov_ost_data_v1, l_object_seq);
+       CHECK_MEMBER(lov_ost_data_v1, l_ost_gen);
+       CHECK_MEMBER(lov_ost_data_v1, l_ost_idx);
 }
 
 static void
 check_lov_mds_md_v1(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lov_mds_md_v1);
-        CHECK_MEMBER(lov_mds_md_v1, lmm_magic);
-        CHECK_MEMBER(lov_mds_md_v1, lmm_pattern);
-        CHECK_MEMBER(lov_mds_md_v1, lmm_object_id);
-        CHECK_MEMBER(lov_mds_md_v1, lmm_object_seq);
-        CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_size);
-        CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_count);
+       BLANK_LINE();
+       CHECK_STRUCT(lov_mds_md_v1);
+       CHECK_MEMBER(lov_mds_md_v1, lmm_magic);
+       CHECK_MEMBER(lov_mds_md_v1, lmm_pattern);
+       CHECK_MEMBER(lov_mds_md_v1, lmm_object_id);
+       CHECK_MEMBER(lov_mds_md_v1, lmm_object_seq);
+       CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_size);
+       CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_count);
        CHECK_MEMBER(lov_mds_md_v1, lmm_layout_gen);
-        CHECK_MEMBER(lov_mds_md_v1, lmm_objects[0]);
+       CHECK_MEMBER(lov_mds_md_v1, lmm_objects[0]);
 
-        CHECK_CDEFINE(LOV_MAGIC_V1);
+       CHECK_CDEFINE(LOV_MAGIC_V1);
 }
 
 static void
 check_lov_mds_md_v3(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lov_mds_md_v3);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_magic);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_pattern);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_object_id);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_object_seq);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_stripe_size);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_stripe_count);
+       BLANK_LINE();
+       CHECK_STRUCT(lov_mds_md_v3);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_magic);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_pattern);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_object_id);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_object_seq);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_stripe_size);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_stripe_count);
        CHECK_MEMBER(lov_mds_md_v3, lmm_layout_gen);
-        CHECK_CVALUE(LOV_MAXPOOLNAME);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_pool_name[LOV_MAXPOOLNAME]);
-        CHECK_MEMBER(lov_mds_md_v3, lmm_objects[0]);
+       CHECK_CVALUE(LOV_MAXPOOLNAME);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_pool_name[LOV_MAXPOOLNAME]);
+       CHECK_MEMBER(lov_mds_md_v3, lmm_objects[0]);
 
-        CHECK_CDEFINE(LOV_MAGIC_V3);
+       CHECK_CDEFINE(LOV_MAGIC_V3);
 
-        CHECK_VALUE_X(LOV_PATTERN_RAID0);
-        CHECK_VALUE_X(LOV_PATTERN_RAID1);
-        CHECK_VALUE_X(LOV_PATTERN_FIRST);
-        CHECK_VALUE_X(LOV_PATTERN_CMOBD);
+       CHECK_VALUE_X(LOV_PATTERN_RAID0);
+       CHECK_VALUE_X(LOV_PATTERN_RAID1);
+       CHECK_VALUE_X(LOV_PATTERN_FIRST);
+       CHECK_VALUE_X(LOV_PATTERN_CMOBD);
 }
 
 static void
 check_obd_statfs(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(obd_statfs);
-        CHECK_MEMBER(obd_statfs, os_type);
-        CHECK_MEMBER(obd_statfs, os_blocks);
-        CHECK_MEMBER(obd_statfs, os_bfree);
-        CHECK_MEMBER(obd_statfs, os_bavail);
-        CHECK_MEMBER(obd_statfs, os_ffree);
-        CHECK_MEMBER(obd_statfs, os_fsid);
-        CHECK_MEMBER(obd_statfs, os_bsize);
-        CHECK_MEMBER(obd_statfs, os_namelen);
-        CHECK_MEMBER(obd_statfs, os_state);
-        CHECK_MEMBER(obd_statfs, os_fprecreated);
-        CHECK_MEMBER(obd_statfs, os_spare2);
-        CHECK_MEMBER(obd_statfs, os_spare3);
-        CHECK_MEMBER(obd_statfs, os_spare4);
-        CHECK_MEMBER(obd_statfs, os_spare5);
-        CHECK_MEMBER(obd_statfs, os_spare6);
-        CHECK_MEMBER(obd_statfs, os_spare7);
-        CHECK_MEMBER(obd_statfs, os_spare8);
-        CHECK_MEMBER(obd_statfs, os_spare9);
+       BLANK_LINE();
+       CHECK_STRUCT(obd_statfs);
+       CHECK_MEMBER(obd_statfs, os_type);
+       CHECK_MEMBER(obd_statfs, os_blocks);
+       CHECK_MEMBER(obd_statfs, os_bfree);
+       CHECK_MEMBER(obd_statfs, os_bavail);
+       CHECK_MEMBER(obd_statfs, os_ffree);
+       CHECK_MEMBER(obd_statfs, os_fsid);
+       CHECK_MEMBER(obd_statfs, os_bsize);
+       CHECK_MEMBER(obd_statfs, os_namelen);
+       CHECK_MEMBER(obd_statfs, os_state);
+       CHECK_MEMBER(obd_statfs, os_fprecreated);
+       CHECK_MEMBER(obd_statfs, os_spare2);
+       CHECK_MEMBER(obd_statfs, os_spare3);
+       CHECK_MEMBER(obd_statfs, os_spare4);
+       CHECK_MEMBER(obd_statfs, os_spare5);
+       CHECK_MEMBER(obd_statfs, os_spare6);
+       CHECK_MEMBER(obd_statfs, os_spare7);
+       CHECK_MEMBER(obd_statfs, os_spare8);
+       CHECK_MEMBER(obd_statfs, os_spare9);
 }
 
 static void
 check_obd_ioobj(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(obd_ioobj);
-        CHECK_MEMBER(obd_ioobj, ioo_id);
-        CHECK_MEMBER(obd_ioobj, ioo_seq);
-        CHECK_MEMBER(obd_ioobj, ioo_type);
-        CHECK_MEMBER(obd_ioobj, ioo_bufcnt);
+       BLANK_LINE();
+       CHECK_STRUCT(obd_ioobj);
+       CHECK_MEMBER(obd_ioobj, ioo_id);
+       CHECK_MEMBER(obd_ioobj, ioo_seq);
+       CHECK_MEMBER(obd_ioobj, ioo_type);
+       CHECK_MEMBER(obd_ioobj, ioo_bufcnt);
 }
 
 static void
@@ -734,40 +731,40 @@ check_obd_quotactl(void)
        CHECK_VALUE(QUOTABLOCK_BITS);
        CHECK_VALUE(QUOTABLOCK_SIZE);
 
-        BLANK_LINE();
-        CHECK_STRUCT(obd_quotactl);
-        CHECK_MEMBER(obd_quotactl, qc_cmd);
-        CHECK_MEMBER(obd_quotactl, qc_type);
-        CHECK_MEMBER(obd_quotactl, qc_id);
-        CHECK_MEMBER(obd_quotactl, qc_stat);
-        CHECK_MEMBER(obd_quotactl, qc_dqinfo);
-        CHECK_MEMBER(obd_quotactl, qc_dqblk);
+       BLANK_LINE();
+       CHECK_STRUCT(obd_quotactl);
+       CHECK_MEMBER(obd_quotactl, qc_cmd);
+       CHECK_MEMBER(obd_quotactl, qc_type);
+       CHECK_MEMBER(obd_quotactl, qc_id);
+       CHECK_MEMBER(obd_quotactl, qc_stat);
+       CHECK_MEMBER(obd_quotactl, qc_dqinfo);
+       CHECK_MEMBER(obd_quotactl, qc_dqblk);
 
-        BLANK_LINE();
-        CHECK_STRUCT(obd_dqinfo);
-        CHECK_MEMBER(obd_dqinfo, dqi_bgrace);
-        CHECK_MEMBER(obd_dqinfo, dqi_igrace);
-        CHECK_MEMBER(obd_dqinfo, dqi_flags);
-        CHECK_MEMBER(obd_dqinfo, dqi_valid);
+       BLANK_LINE();
+       CHECK_STRUCT(obd_dqinfo);
+       CHECK_MEMBER(obd_dqinfo, dqi_bgrace);
+       CHECK_MEMBER(obd_dqinfo, dqi_igrace);
+       CHECK_MEMBER(obd_dqinfo, dqi_flags);
+       CHECK_MEMBER(obd_dqinfo, dqi_valid);
 
-        BLANK_LINE();
-        CHECK_STRUCT(obd_dqblk);
-        CHECK_MEMBER(obd_dqblk, dqb_bhardlimit);
-        CHECK_MEMBER(obd_dqblk, dqb_bsoftlimit);
-        CHECK_MEMBER(obd_dqblk, dqb_curspace);
-        CHECK_MEMBER(obd_dqblk, dqb_ihardlimit);
-        CHECK_MEMBER(obd_dqblk, dqb_isoftlimit);
-        CHECK_MEMBER(obd_dqblk, dqb_curinodes);
-        CHECK_MEMBER(obd_dqblk, dqb_btime);
-        CHECK_MEMBER(obd_dqblk, dqb_itime);
-        CHECK_MEMBER(obd_dqblk, dqb_valid);
-        CHECK_MEMBER(obd_dqblk, dqb_padding);
-
-        CHECK_DEFINE_X(Q_QUOTACHECK);
-        CHECK_DEFINE_X(Q_INITQUOTA);
-        CHECK_DEFINE_X(Q_GETOINFO);
-        CHECK_DEFINE_X(Q_GETOQUOTA);
-        CHECK_DEFINE_X(Q_FINVALIDATE);
+       BLANK_LINE();
+       CHECK_STRUCT(obd_dqblk);
+       CHECK_MEMBER(obd_dqblk, dqb_bhardlimit);
+       CHECK_MEMBER(obd_dqblk, dqb_bsoftlimit);
+       CHECK_MEMBER(obd_dqblk, dqb_curspace);
+       CHECK_MEMBER(obd_dqblk, dqb_ihardlimit);
+       CHECK_MEMBER(obd_dqblk, dqb_isoftlimit);
+       CHECK_MEMBER(obd_dqblk, dqb_curinodes);
+       CHECK_MEMBER(obd_dqblk, dqb_btime);
+       CHECK_MEMBER(obd_dqblk, dqb_itime);
+       CHECK_MEMBER(obd_dqblk, dqb_valid);
+       CHECK_MEMBER(obd_dqblk, dqb_padding);
+
+       CHECK_DEFINE_X(Q_QUOTACHECK);
+       CHECK_DEFINE_X(Q_INITQUOTA);
+       CHECK_DEFINE_X(Q_GETOINFO);
+       CHECK_DEFINE_X(Q_GETOQUOTA);
+       CHECK_DEFINE_X(Q_FINVALIDATE);
 
        BLANK_LINE();
        CHECK_STRUCT(lquota_acct_rec);
@@ -827,507 +824,507 @@ check_obd_idx_read(void)
 static void
 check_niobuf_remote(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(niobuf_remote);
-        CHECK_MEMBER(niobuf_remote, offset);
-        CHECK_MEMBER(niobuf_remote, len);
-        CHECK_MEMBER(niobuf_remote, flags);
+       BLANK_LINE();
+       CHECK_STRUCT(niobuf_remote);
+       CHECK_MEMBER(niobuf_remote, offset);
+       CHECK_MEMBER(niobuf_remote, len);
+       CHECK_MEMBER(niobuf_remote, flags);
 
-        CHECK_DEFINE_X(OBD_BRW_READ);
-        CHECK_DEFINE_X(OBD_BRW_WRITE);
-        CHECK_DEFINE_X(OBD_BRW_SYNC);
-        CHECK_DEFINE_X(OBD_BRW_CHECK);
-        CHECK_DEFINE_X(OBD_BRW_FROM_GRANT);
-        CHECK_DEFINE_X(OBD_BRW_GRANTED);
-        CHECK_DEFINE_X(OBD_BRW_NOCACHE);
-        CHECK_DEFINE_X(OBD_BRW_NOQUOTA);
-        CHECK_DEFINE_X(OBD_BRW_SRVLOCK);
-        CHECK_DEFINE_X(OBD_BRW_ASYNC);
-        CHECK_DEFINE_X(OBD_BRW_MEMALLOC);
+       CHECK_DEFINE_X(OBD_BRW_READ);
+       CHECK_DEFINE_X(OBD_BRW_WRITE);
+       CHECK_DEFINE_X(OBD_BRW_SYNC);
+       CHECK_DEFINE_X(OBD_BRW_CHECK);
+       CHECK_DEFINE_X(OBD_BRW_FROM_GRANT);
+       CHECK_DEFINE_X(OBD_BRW_GRANTED);
+       CHECK_DEFINE_X(OBD_BRW_NOCACHE);
+       CHECK_DEFINE_X(OBD_BRW_NOQUOTA);
+       CHECK_DEFINE_X(OBD_BRW_SRVLOCK);
+       CHECK_DEFINE_X(OBD_BRW_ASYNC);
+       CHECK_DEFINE_X(OBD_BRW_MEMALLOC);
 }
 
 static void
 check_ost_body(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ost_body);
-        CHECK_MEMBER(ost_body, oa);
+       BLANK_LINE();
+       CHECK_STRUCT(ost_body);
+       CHECK_MEMBER(ost_body, oa);
 }
 
 static void
 check_ll_fid(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ll_fid);
-        CHECK_MEMBER(ll_fid, id);
-        CHECK_MEMBER(ll_fid, generation);
-        CHECK_MEMBER(ll_fid, f_type);
+       BLANK_LINE();
+       CHECK_STRUCT(ll_fid);
+       CHECK_MEMBER(ll_fid, id);
+       CHECK_MEMBER(ll_fid, generation);
+       CHECK_MEMBER(ll_fid, f_type);
 }
 
 static void
 check_mdt_body(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_body);
-        CHECK_MEMBER(mdt_body, fid1);
-        CHECK_MEMBER(mdt_body, fid2);
-        CHECK_MEMBER(mdt_body, handle);
-        CHECK_MEMBER(mdt_body, valid);
-        CHECK_MEMBER(mdt_body, size);
-        CHECK_MEMBER(mdt_body, mtime);
-        CHECK_MEMBER(mdt_body, atime);
-        CHECK_MEMBER(mdt_body, ctime);
-        CHECK_MEMBER(mdt_body, blocks);
-        CHECK_MEMBER(mdt_body, ino);
-        CHECK_MEMBER(mdt_body, fsuid);
-        CHECK_MEMBER(mdt_body, fsgid);
-        CHECK_MEMBER(mdt_body, capability);
-        CHECK_MEMBER(mdt_body, mode);
-        CHECK_MEMBER(mdt_body, uid);
-        CHECK_MEMBER(mdt_body, gid);
-        CHECK_MEMBER(mdt_body, flags);
-        CHECK_MEMBER(mdt_body, rdev);
-        CHECK_MEMBER(mdt_body, nlink);
-        CHECK_MEMBER(mdt_body, generation);
-        CHECK_MEMBER(mdt_body, suppgid);
-        CHECK_MEMBER(mdt_body, eadatasize);
-        CHECK_MEMBER(mdt_body, aclsize);
-        CHECK_MEMBER(mdt_body, max_mdsize);
-        CHECK_MEMBER(mdt_body, max_cookiesize);
-        CHECK_MEMBER(mdt_body, uid_h);
-        CHECK_MEMBER(mdt_body, gid_h);
-        CHECK_MEMBER(mdt_body, padding_5);
-        CHECK_MEMBER(mdt_body, padding_6);
-        CHECK_MEMBER(mdt_body, padding_7);
-        CHECK_MEMBER(mdt_body, padding_8);
-        CHECK_MEMBER(mdt_body, padding_9);
-        CHECK_MEMBER(mdt_body, padding_10);
-
-        CHECK_VALUE_O(MDS_FMODE_CLOSED);
-        CHECK_VALUE_O(MDS_FMODE_EXEC);
-        CHECK_VALUE_O(MDS_FMODE_EPOCH);
-        CHECK_VALUE_O(MDS_FMODE_TRUNC);
-        CHECK_VALUE_O(MDS_FMODE_SOM);
-
-        CHECK_VALUE_O(MDS_OPEN_CREATED);
-        CHECK_VALUE_O(MDS_OPEN_CROSS);
-        CHECK_VALUE_O(MDS_OPEN_CREAT);
-        CHECK_VALUE_O(MDS_OPEN_EXCL);
-        CHECK_VALUE_O(MDS_OPEN_TRUNC);
-        CHECK_VALUE_O(MDS_OPEN_APPEND);
-        CHECK_VALUE_O(MDS_OPEN_SYNC);
-        CHECK_VALUE_O(MDS_OPEN_DIRECTORY);
-        CHECK_VALUE_O(MDS_OPEN_BY_FID);
-        CHECK_VALUE_O(MDS_OPEN_DELAY_CREATE);
-        CHECK_VALUE_O(MDS_OPEN_OWNEROVERRIDE);
-        CHECK_VALUE_O(MDS_OPEN_JOIN_FILE);
-        CHECK_VALUE_O(MDS_OPEN_LOCK);
-        CHECK_VALUE_O(MDS_OPEN_HAS_EA);
-        CHECK_VALUE_O(MDS_OPEN_HAS_OBJS);
-        CHECK_VALUE_64O(MDS_OPEN_NORESTORE);
-        CHECK_VALUE_64O(MDS_OPEN_NEWSTRIPE);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_body);
+       CHECK_MEMBER(mdt_body, fid1);
+       CHECK_MEMBER(mdt_body, fid2);
+       CHECK_MEMBER(mdt_body, handle);
+       CHECK_MEMBER(mdt_body, valid);
+       CHECK_MEMBER(mdt_body, size);
+       CHECK_MEMBER(mdt_body, mtime);
+       CHECK_MEMBER(mdt_body, atime);
+       CHECK_MEMBER(mdt_body, ctime);
+       CHECK_MEMBER(mdt_body, blocks);
+       CHECK_MEMBER(mdt_body, ino);
+       CHECK_MEMBER(mdt_body, fsuid);
+       CHECK_MEMBER(mdt_body, fsgid);
+       CHECK_MEMBER(mdt_body, capability);
+       CHECK_MEMBER(mdt_body, mode);
+       CHECK_MEMBER(mdt_body, uid);
+       CHECK_MEMBER(mdt_body, gid);
+       CHECK_MEMBER(mdt_body, flags);
+       CHECK_MEMBER(mdt_body, rdev);
+       CHECK_MEMBER(mdt_body, nlink);
+       CHECK_MEMBER(mdt_body, generation);
+       CHECK_MEMBER(mdt_body, suppgid);
+       CHECK_MEMBER(mdt_body, eadatasize);
+       CHECK_MEMBER(mdt_body, aclsize);
+       CHECK_MEMBER(mdt_body, max_mdsize);
+       CHECK_MEMBER(mdt_body, max_cookiesize);
+       CHECK_MEMBER(mdt_body, uid_h);
+       CHECK_MEMBER(mdt_body, gid_h);
+       CHECK_MEMBER(mdt_body, padding_5);
+       CHECK_MEMBER(mdt_body, padding_6);
+       CHECK_MEMBER(mdt_body, padding_7);
+       CHECK_MEMBER(mdt_body, padding_8);
+       CHECK_MEMBER(mdt_body, padding_9);
+       CHECK_MEMBER(mdt_body, padding_10);
+
+       CHECK_VALUE_O(MDS_FMODE_CLOSED);
+       CHECK_VALUE_O(MDS_FMODE_EXEC);
+       CHECK_VALUE_O(MDS_FMODE_EPOCH);
+       CHECK_VALUE_O(MDS_FMODE_TRUNC);
+       CHECK_VALUE_O(MDS_FMODE_SOM);
+
+       CHECK_VALUE_O(MDS_OPEN_CREATED);
+       CHECK_VALUE_O(MDS_OPEN_CROSS);
+       CHECK_VALUE_O(MDS_OPEN_CREAT);
+       CHECK_VALUE_O(MDS_OPEN_EXCL);
+       CHECK_VALUE_O(MDS_OPEN_TRUNC);
+       CHECK_VALUE_O(MDS_OPEN_APPEND);
+       CHECK_VALUE_O(MDS_OPEN_SYNC);
+       CHECK_VALUE_O(MDS_OPEN_DIRECTORY);
+       CHECK_VALUE_O(MDS_OPEN_BY_FID);
+       CHECK_VALUE_O(MDS_OPEN_DELAY_CREATE);
+       CHECK_VALUE_O(MDS_OPEN_OWNEROVERRIDE);
+       CHECK_VALUE_O(MDS_OPEN_JOIN_FILE);
+       CHECK_VALUE_O(MDS_OPEN_LOCK);
+       CHECK_VALUE_O(MDS_OPEN_HAS_EA);
+       CHECK_VALUE_O(MDS_OPEN_HAS_OBJS);
+       CHECK_VALUE_64O(MDS_OPEN_NORESTORE);
+       CHECK_VALUE_64O(MDS_OPEN_NEWSTRIPE);
        CHECK_VALUE_64O(MDS_OPEN_VOLATILE);
 
-        /* these should be identical to their EXT3_*_FL counterparts, and
-         * are redefined only to avoid dragging in ext3_fs.h */
-        CHECK_DEFINE_X(LUSTRE_SYNC_FL);
-        CHECK_DEFINE_X(LUSTRE_IMMUTABLE_FL);
-        CHECK_DEFINE_X(LUSTRE_APPEND_FL);
-        CHECK_DEFINE_X(LUSTRE_NOATIME_FL);
-        CHECK_DEFINE_X(LUSTRE_DIRSYNC_FL);
+       /* these should be identical to their EXT3_*_FL counterparts, and
+        * are redefined only to avoid dragging in ext3_fs.h */
+       CHECK_DEFINE_X(LUSTRE_SYNC_FL);
+       CHECK_DEFINE_X(LUSTRE_IMMUTABLE_FL);
+       CHECK_DEFINE_X(LUSTRE_APPEND_FL);
+       CHECK_DEFINE_X(LUSTRE_NOATIME_FL);
+       CHECK_DEFINE_X(LUSTRE_DIRSYNC_FL);
 
-        CHECK_DEFINE_X(MDS_INODELOCK_LOOKUP);
-        CHECK_DEFINE_X(MDS_INODELOCK_UPDATE);
-        CHECK_DEFINE_X(MDS_INODELOCK_OPEN);
-        CHECK_DEFINE_X(MDS_INODELOCK_LAYOUT);
+       CHECK_DEFINE_X(MDS_INODELOCK_LOOKUP);
+       CHECK_DEFINE_X(MDS_INODELOCK_UPDATE);
+       CHECK_DEFINE_X(MDS_INODELOCK_OPEN);
+       CHECK_DEFINE_X(MDS_INODELOCK_LAYOUT);
 }
 
 static void
 check_mdt_ioepoch(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_ioepoch);
-        CHECK_MEMBER(mdt_ioepoch, handle);
-        CHECK_MEMBER(mdt_ioepoch, ioepoch);
-        CHECK_MEMBER(mdt_ioepoch, flags);
-        CHECK_MEMBER(mdt_ioepoch, padding);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_ioepoch);
+       CHECK_MEMBER(mdt_ioepoch, handle);
+       CHECK_MEMBER(mdt_ioepoch, ioepoch);
+       CHECK_MEMBER(mdt_ioepoch, flags);
+       CHECK_MEMBER(mdt_ioepoch, padding);
 }
 
 static void
 check_mdt_remote_perm(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_remote_perm);
-        CHECK_MEMBER(mdt_remote_perm, rp_uid);
-        CHECK_MEMBER(mdt_remote_perm, rp_gid);
-        CHECK_MEMBER(mdt_remote_perm, rp_fsuid);
-        CHECK_MEMBER(mdt_remote_perm, rp_fsgid);
-        CHECK_MEMBER(mdt_remote_perm, rp_access_perm);
-        CHECK_MEMBER(mdt_remote_perm, rp_padding);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_remote_perm);
+       CHECK_MEMBER(mdt_remote_perm, rp_uid);
+       CHECK_MEMBER(mdt_remote_perm, rp_gid);
+       CHECK_MEMBER(mdt_remote_perm, rp_fsuid);
+       CHECK_MEMBER(mdt_remote_perm, rp_fsgid);
+       CHECK_MEMBER(mdt_remote_perm, rp_access_perm);
+       CHECK_MEMBER(mdt_remote_perm, rp_padding);
 
-        CHECK_VALUE_X(CFS_SETUID_PERM);
-        CHECK_VALUE_X(CFS_SETGID_PERM);
-        CHECK_VALUE_X(CFS_SETGRP_PERM);
-        CHECK_VALUE_X(CFS_RMTACL_PERM);
-        CHECK_VALUE_X(CFS_RMTOWN_PERM);
+       CHECK_VALUE_X(CFS_SETUID_PERM);
+       CHECK_VALUE_X(CFS_SETGID_PERM);
+       CHECK_VALUE_X(CFS_SETGRP_PERM);
+       CHECK_VALUE_X(CFS_RMTACL_PERM);
+       CHECK_VALUE_X(CFS_RMTOWN_PERM);
 }
 
 static void
 check_mdt_rec_setattr(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_rec_setattr);
-        CHECK_MEMBER(mdt_rec_setattr, sa_opcode);
-        CHECK_MEMBER(mdt_rec_setattr, sa_cap);
-        CHECK_MEMBER(mdt_rec_setattr, sa_fsuid);
-        CHECK_MEMBER(mdt_rec_setattr, sa_fsuid_h);
-        CHECK_MEMBER(mdt_rec_setattr, sa_fsgid);
-        CHECK_MEMBER(mdt_rec_setattr, sa_fsgid_h);
-        CHECK_MEMBER(mdt_rec_setattr, sa_suppgid);
-        CHECK_MEMBER(mdt_rec_setattr, sa_suppgid_h);
-        CHECK_MEMBER(mdt_rec_setattr, sa_padding_1);
-        CHECK_MEMBER(mdt_rec_setattr, sa_padding_1_h);
-        CHECK_MEMBER(mdt_rec_setattr, sa_fid);
-        CHECK_MEMBER(mdt_rec_setattr, sa_valid);
-        CHECK_MEMBER(mdt_rec_setattr, sa_uid);
-        CHECK_MEMBER(mdt_rec_setattr, sa_gid);
-        CHECK_MEMBER(mdt_rec_setattr, sa_size);
-        CHECK_MEMBER(mdt_rec_setattr, sa_blocks);
-        CHECK_MEMBER(mdt_rec_setattr, sa_mtime);
-        CHECK_MEMBER(mdt_rec_setattr, sa_atime);
-        CHECK_MEMBER(mdt_rec_setattr, sa_ctime);
-        CHECK_MEMBER(mdt_rec_setattr, sa_attr_flags);
-        CHECK_MEMBER(mdt_rec_setattr, sa_mode);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_rec_setattr);
+       CHECK_MEMBER(mdt_rec_setattr, sa_opcode);
+       CHECK_MEMBER(mdt_rec_setattr, sa_cap);
+       CHECK_MEMBER(mdt_rec_setattr, sa_fsuid);
+       CHECK_MEMBER(mdt_rec_setattr, sa_fsuid_h);
+       CHECK_MEMBER(mdt_rec_setattr, sa_fsgid);
+       CHECK_MEMBER(mdt_rec_setattr, sa_fsgid_h);
+       CHECK_MEMBER(mdt_rec_setattr, sa_suppgid);
+       CHECK_MEMBER(mdt_rec_setattr, sa_suppgid_h);
+       CHECK_MEMBER(mdt_rec_setattr, sa_padding_1);
+       CHECK_MEMBER(mdt_rec_setattr, sa_padding_1_h);
+       CHECK_MEMBER(mdt_rec_setattr, sa_fid);
+       CHECK_MEMBER(mdt_rec_setattr, sa_valid);
+       CHECK_MEMBER(mdt_rec_setattr, sa_uid);
+       CHECK_MEMBER(mdt_rec_setattr, sa_gid);
+       CHECK_MEMBER(mdt_rec_setattr, sa_size);
+       CHECK_MEMBER(mdt_rec_setattr, sa_blocks);
+       CHECK_MEMBER(mdt_rec_setattr, sa_mtime);
+       CHECK_MEMBER(mdt_rec_setattr, sa_atime);
+       CHECK_MEMBER(mdt_rec_setattr, sa_ctime);
+       CHECK_MEMBER(mdt_rec_setattr, sa_attr_flags);
+       CHECK_MEMBER(mdt_rec_setattr, sa_mode);
        CHECK_MEMBER(mdt_rec_setattr, sa_bias);
-        CHECK_MEMBER(mdt_rec_setattr, sa_padding_3);
-        CHECK_MEMBER(mdt_rec_setattr, sa_padding_4);
-        CHECK_MEMBER(mdt_rec_setattr, sa_padding_5);
+       CHECK_MEMBER(mdt_rec_setattr, sa_padding_3);
+       CHECK_MEMBER(mdt_rec_setattr, sa_padding_4);
+       CHECK_MEMBER(mdt_rec_setattr, sa_padding_5);
 }
 
 static void
 check_mdt_rec_create(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_rec_create);
-        CHECK_MEMBER(mdt_rec_create, cr_opcode);
-        CHECK_MEMBER(mdt_rec_create, cr_cap);
-        CHECK_MEMBER(mdt_rec_create, cr_fsuid);
-        CHECK_MEMBER(mdt_rec_create, cr_fsuid_h);
-        CHECK_MEMBER(mdt_rec_create, cr_fsgid);
-        CHECK_MEMBER(mdt_rec_create, cr_fsgid_h);
-        CHECK_MEMBER(mdt_rec_create, cr_suppgid1);
-        CHECK_MEMBER(mdt_rec_create, cr_suppgid1_h);
-        CHECK_MEMBER(mdt_rec_create, cr_suppgid2);
-        CHECK_MEMBER(mdt_rec_create, cr_suppgid2_h);
-        CHECK_MEMBER(mdt_rec_create, cr_fid1);
-        CHECK_MEMBER(mdt_rec_create, cr_fid2);
-        CHECK_MEMBER(mdt_rec_create, cr_old_handle);
-        CHECK_MEMBER(mdt_rec_create, cr_time);
-        CHECK_MEMBER(mdt_rec_create, cr_rdev);
-        CHECK_MEMBER(mdt_rec_create, cr_ioepoch);
-        CHECK_MEMBER(mdt_rec_create, cr_padding_1);
-        CHECK_MEMBER(mdt_rec_create, cr_mode);
-        CHECK_MEMBER(mdt_rec_create, cr_bias);
-        CHECK_MEMBER(mdt_rec_create, cr_flags_l);
-        CHECK_MEMBER(mdt_rec_create, cr_flags_h);
-        CHECK_MEMBER(mdt_rec_create, cr_umask);
-        CHECK_MEMBER(mdt_rec_create, cr_padding_4);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_rec_create);
+       CHECK_MEMBER(mdt_rec_create, cr_opcode);
+       CHECK_MEMBER(mdt_rec_create, cr_cap);
+       CHECK_MEMBER(mdt_rec_create, cr_fsuid);
+       CHECK_MEMBER(mdt_rec_create, cr_fsuid_h);
+       CHECK_MEMBER(mdt_rec_create, cr_fsgid);
+       CHECK_MEMBER(mdt_rec_create, cr_fsgid_h);
+       CHECK_MEMBER(mdt_rec_create, cr_suppgid1);
+       CHECK_MEMBER(mdt_rec_create, cr_suppgid1_h);
+       CHECK_MEMBER(mdt_rec_create, cr_suppgid2);
+       CHECK_MEMBER(mdt_rec_create, cr_suppgid2_h);
+       CHECK_MEMBER(mdt_rec_create, cr_fid1);
+       CHECK_MEMBER(mdt_rec_create, cr_fid2);
+       CHECK_MEMBER(mdt_rec_create, cr_old_handle);
+       CHECK_MEMBER(mdt_rec_create, cr_time);
+       CHECK_MEMBER(mdt_rec_create, cr_rdev);
+       CHECK_MEMBER(mdt_rec_create, cr_ioepoch);
+       CHECK_MEMBER(mdt_rec_create, cr_padding_1);
+       CHECK_MEMBER(mdt_rec_create, cr_mode);
+       CHECK_MEMBER(mdt_rec_create, cr_bias);
+       CHECK_MEMBER(mdt_rec_create, cr_flags_l);
+       CHECK_MEMBER(mdt_rec_create, cr_flags_h);
+       CHECK_MEMBER(mdt_rec_create, cr_umask);
+       CHECK_MEMBER(mdt_rec_create, cr_padding_4);
 }
 
 static void
 check_mdt_rec_link(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_rec_link);
-        CHECK_MEMBER(mdt_rec_link, lk_opcode);
-        CHECK_MEMBER(mdt_rec_link, lk_cap);
-        CHECK_MEMBER(mdt_rec_link, lk_fsuid);
-        CHECK_MEMBER(mdt_rec_link, lk_fsuid_h);
-        CHECK_MEMBER(mdt_rec_link, lk_fsgid);
-        CHECK_MEMBER(mdt_rec_link, lk_fsgid_h);
-        CHECK_MEMBER(mdt_rec_link, lk_suppgid1);
-        CHECK_MEMBER(mdt_rec_link, lk_suppgid1_h);
-        CHECK_MEMBER(mdt_rec_link, lk_suppgid2);
-        CHECK_MEMBER(mdt_rec_link, lk_suppgid2_h);
-        CHECK_MEMBER(mdt_rec_link, lk_fid1);
-        CHECK_MEMBER(mdt_rec_link, lk_fid2);
-        CHECK_MEMBER(mdt_rec_link, lk_time);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_1);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_2);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_3);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_4);
-        CHECK_MEMBER(mdt_rec_link, lk_bias);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_5);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_6);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_7);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_8);
-        CHECK_MEMBER(mdt_rec_link, lk_padding_9);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_rec_link);
+       CHECK_MEMBER(mdt_rec_link, lk_opcode);
+       CHECK_MEMBER(mdt_rec_link, lk_cap);
+       CHECK_MEMBER(mdt_rec_link, lk_fsuid);
+       CHECK_MEMBER(mdt_rec_link, lk_fsuid_h);
+       CHECK_MEMBER(mdt_rec_link, lk_fsgid);
+       CHECK_MEMBER(mdt_rec_link, lk_fsgid_h);
+       CHECK_MEMBER(mdt_rec_link, lk_suppgid1);
+       CHECK_MEMBER(mdt_rec_link, lk_suppgid1_h);
+       CHECK_MEMBER(mdt_rec_link, lk_suppgid2);
+       CHECK_MEMBER(mdt_rec_link, lk_suppgid2_h);
+       CHECK_MEMBER(mdt_rec_link, lk_fid1);
+       CHECK_MEMBER(mdt_rec_link, lk_fid2);
+       CHECK_MEMBER(mdt_rec_link, lk_time);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_1);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_2);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_3);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_4);
+       CHECK_MEMBER(mdt_rec_link, lk_bias);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_5);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_6);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_7);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_8);
+       CHECK_MEMBER(mdt_rec_link, lk_padding_9);
 }
 
 static void
 check_mdt_rec_unlink(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_rec_unlink);
-        CHECK_MEMBER(mdt_rec_unlink, ul_opcode);
-        CHECK_MEMBER(mdt_rec_unlink, ul_cap);
-        CHECK_MEMBER(mdt_rec_unlink, ul_fsuid);
-        CHECK_MEMBER(mdt_rec_unlink, ul_fsuid_h);
-        CHECK_MEMBER(mdt_rec_unlink, ul_fsgid);
-        CHECK_MEMBER(mdt_rec_unlink, ul_fsgid_h);
-        CHECK_MEMBER(mdt_rec_unlink, ul_suppgid1);
-        CHECK_MEMBER(mdt_rec_unlink, ul_suppgid1_h);
-        CHECK_MEMBER(mdt_rec_unlink, ul_suppgid2);
-        CHECK_MEMBER(mdt_rec_unlink, ul_suppgid2_h);
-        CHECK_MEMBER(mdt_rec_unlink, ul_fid1);
-        CHECK_MEMBER(mdt_rec_unlink, ul_fid2);
-        CHECK_MEMBER(mdt_rec_unlink, ul_time);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_2);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_3);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_4);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_5);
-        CHECK_MEMBER(mdt_rec_unlink, ul_bias);
-        CHECK_MEMBER(mdt_rec_unlink, ul_mode);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_6);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_7);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_8);
-        CHECK_MEMBER(mdt_rec_unlink, ul_padding_9);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_rec_unlink);
+       CHECK_MEMBER(mdt_rec_unlink, ul_opcode);
+       CHECK_MEMBER(mdt_rec_unlink, ul_cap);
+       CHECK_MEMBER(mdt_rec_unlink, ul_fsuid);
+       CHECK_MEMBER(mdt_rec_unlink, ul_fsuid_h);
+       CHECK_MEMBER(mdt_rec_unlink, ul_fsgid);
+       CHECK_MEMBER(mdt_rec_unlink, ul_fsgid_h);
+       CHECK_MEMBER(mdt_rec_unlink, ul_suppgid1);
+       CHECK_MEMBER(mdt_rec_unlink, ul_suppgid1_h);
+       CHECK_MEMBER(mdt_rec_unlink, ul_suppgid2);
+       CHECK_MEMBER(mdt_rec_unlink, ul_suppgid2_h);
+       CHECK_MEMBER(mdt_rec_unlink, ul_fid1);
+       CHECK_MEMBER(mdt_rec_unlink, ul_fid2);
+       CHECK_MEMBER(mdt_rec_unlink, ul_time);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_2);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_3);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_4);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_5);
+       CHECK_MEMBER(mdt_rec_unlink, ul_bias);
+       CHECK_MEMBER(mdt_rec_unlink, ul_mode);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_6);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_7);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_8);
+       CHECK_MEMBER(mdt_rec_unlink, ul_padding_9);
 }
 
 static void
 check_mdt_rec_rename(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_rec_rename);
-        CHECK_MEMBER(mdt_rec_rename, rn_opcode);
-        CHECK_MEMBER(mdt_rec_rename, rn_cap);
-        CHECK_MEMBER(mdt_rec_rename, rn_fsuid);
-        CHECK_MEMBER(mdt_rec_rename, rn_fsuid_h);
-        CHECK_MEMBER(mdt_rec_rename, rn_fsgid);
-        CHECK_MEMBER(mdt_rec_rename, rn_fsgid_h);
-        CHECK_MEMBER(mdt_rec_rename, rn_suppgid1);
-        CHECK_MEMBER(mdt_rec_rename, rn_suppgid1_h);
-        CHECK_MEMBER(mdt_rec_rename, rn_suppgid2);
-        CHECK_MEMBER(mdt_rec_rename, rn_suppgid2_h);
-        CHECK_MEMBER(mdt_rec_rename, rn_fid1);
-        CHECK_MEMBER(mdt_rec_rename, rn_fid2);
-        CHECK_MEMBER(mdt_rec_rename, rn_time);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_1);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_2);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_3);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_4);
-        CHECK_MEMBER(mdt_rec_rename, rn_bias);
-        CHECK_MEMBER(mdt_rec_rename, rn_mode);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_5);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_6);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_7);
-        CHECK_MEMBER(mdt_rec_rename, rn_padding_8);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_rec_rename);
+       CHECK_MEMBER(mdt_rec_rename, rn_opcode);
+       CHECK_MEMBER(mdt_rec_rename, rn_cap);
+       CHECK_MEMBER(mdt_rec_rename, rn_fsuid);
+       CHECK_MEMBER(mdt_rec_rename, rn_fsuid_h);
+       CHECK_MEMBER(mdt_rec_rename, rn_fsgid);
+       CHECK_MEMBER(mdt_rec_rename, rn_fsgid_h);
+       CHECK_MEMBER(mdt_rec_rename, rn_suppgid1);
+       CHECK_MEMBER(mdt_rec_rename, rn_suppgid1_h);
+       CHECK_MEMBER(mdt_rec_rename, rn_suppgid2);
+       CHECK_MEMBER(mdt_rec_rename, rn_suppgid2_h);
+       CHECK_MEMBER(mdt_rec_rename, rn_fid1);
+       CHECK_MEMBER(mdt_rec_rename, rn_fid2);
+       CHECK_MEMBER(mdt_rec_rename, rn_time);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_1);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_2);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_3);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_4);
+       CHECK_MEMBER(mdt_rec_rename, rn_bias);
+       CHECK_MEMBER(mdt_rec_rename, rn_mode);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_5);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_6);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_7);
+       CHECK_MEMBER(mdt_rec_rename, rn_padding_8);
 }
 
 static void
 check_mdt_rec_setxattr(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_rec_setxattr);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_opcode);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_cap);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_fsuid);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_fsuid_h);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_fsgid);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_fsgid_h);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid1);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid1_h);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid2);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid2_h);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_fid);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_1);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_2);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_3);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_valid);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_time);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_5);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_6);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_7);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_size);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_flags);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_8);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_9);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_10);
-        CHECK_MEMBER(mdt_rec_setxattr, sx_padding_11);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_rec_setxattr);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_opcode);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_cap);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_fsuid);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_fsuid_h);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_fsgid);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_fsgid_h);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid1);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid1_h);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid2);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_suppgid2_h);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_fid);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_1);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_2);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_3);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_valid);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_time);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_5);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_6);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_7);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_size);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_flags);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_8);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_9);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_10);
+       CHECK_MEMBER(mdt_rec_setxattr, sx_padding_11);
 }
 
 static void
 check_mdt_rec_reint(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mdt_rec_reint);
-        CHECK_MEMBER(mdt_rec_reint, rr_opcode);
-        CHECK_MEMBER(mdt_rec_reint, rr_cap);
-        CHECK_MEMBER(mdt_rec_reint, rr_fsuid);
-        CHECK_MEMBER(mdt_rec_reint, rr_fsuid_h);
-        CHECK_MEMBER(mdt_rec_reint, rr_fsgid);
-        CHECK_MEMBER(mdt_rec_reint, rr_fsgid_h);
-        CHECK_MEMBER(mdt_rec_reint, rr_suppgid1);
-        CHECK_MEMBER(mdt_rec_reint, rr_suppgid1_h);
-        CHECK_MEMBER(mdt_rec_reint, rr_suppgid2);
-        CHECK_MEMBER(mdt_rec_reint, rr_suppgid2_h);
-        CHECK_MEMBER(mdt_rec_reint, rr_fid1);
-        CHECK_MEMBER(mdt_rec_reint, rr_fid2);
-        CHECK_MEMBER(mdt_rec_reint, rr_mtime);
-        CHECK_MEMBER(mdt_rec_reint, rr_atime);
-        CHECK_MEMBER(mdt_rec_reint, rr_ctime);
-        CHECK_MEMBER(mdt_rec_reint, rr_size);
-        CHECK_MEMBER(mdt_rec_reint, rr_blocks);
-        CHECK_MEMBER(mdt_rec_reint, rr_bias);
-        CHECK_MEMBER(mdt_rec_reint, rr_mode);
-        CHECK_MEMBER(mdt_rec_reint, rr_flags);
-        CHECK_MEMBER(mdt_rec_reint, rr_padding_2);
-        CHECK_MEMBER(mdt_rec_reint, rr_padding_3);
-        CHECK_MEMBER(mdt_rec_reint, rr_padding_4);
+       BLANK_LINE();
+       CHECK_STRUCT(mdt_rec_reint);
+       CHECK_MEMBER(mdt_rec_reint, rr_opcode);
+       CHECK_MEMBER(mdt_rec_reint, rr_cap);
+       CHECK_MEMBER(mdt_rec_reint, rr_fsuid);
+       CHECK_MEMBER(mdt_rec_reint, rr_fsuid_h);
+       CHECK_MEMBER(mdt_rec_reint, rr_fsgid);
+       CHECK_MEMBER(mdt_rec_reint, rr_fsgid_h);
+       CHECK_MEMBER(mdt_rec_reint, rr_suppgid1);
+       CHECK_MEMBER(mdt_rec_reint, rr_suppgid1_h);
+       CHECK_MEMBER(mdt_rec_reint, rr_suppgid2);
+       CHECK_MEMBER(mdt_rec_reint, rr_suppgid2_h);
+       CHECK_MEMBER(mdt_rec_reint, rr_fid1);
+       CHECK_MEMBER(mdt_rec_reint, rr_fid2);
+       CHECK_MEMBER(mdt_rec_reint, rr_mtime);
+       CHECK_MEMBER(mdt_rec_reint, rr_atime);
+       CHECK_MEMBER(mdt_rec_reint, rr_ctime);
+       CHECK_MEMBER(mdt_rec_reint, rr_size);
+       CHECK_MEMBER(mdt_rec_reint, rr_blocks);
+       CHECK_MEMBER(mdt_rec_reint, rr_bias);
+       CHECK_MEMBER(mdt_rec_reint, rr_mode);
+       CHECK_MEMBER(mdt_rec_reint, rr_flags);
+       CHECK_MEMBER(mdt_rec_reint, rr_padding_2);
+       CHECK_MEMBER(mdt_rec_reint, rr_padding_3);
+       CHECK_MEMBER(mdt_rec_reint, rr_padding_4);
 }
 
 static void
 check_lmv_desc(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lmv_desc);
-        CHECK_MEMBER(lmv_desc, ld_tgt_count);
-        CHECK_MEMBER(lmv_desc, ld_active_tgt_count);
-        CHECK_MEMBER(lmv_desc, ld_default_stripe_count);
-        CHECK_MEMBER(lmv_desc, ld_pattern);
-        CHECK_MEMBER(lmv_desc, ld_default_hash_size);
-        CHECK_MEMBER(lmv_desc, ld_padding_1);
-        CHECK_MEMBER(lmv_desc, ld_padding_2);
-        CHECK_MEMBER(lmv_desc, ld_qos_maxage);
-        CHECK_MEMBER(lmv_desc, ld_padding_3);
-        CHECK_MEMBER(lmv_desc, ld_padding_4);
-        CHECK_MEMBER(lmv_desc, ld_uuid);
+       BLANK_LINE();
+       CHECK_STRUCT(lmv_desc);
+       CHECK_MEMBER(lmv_desc, ld_tgt_count);
+       CHECK_MEMBER(lmv_desc, ld_active_tgt_count);
+       CHECK_MEMBER(lmv_desc, ld_default_stripe_count);
+       CHECK_MEMBER(lmv_desc, ld_pattern);
+       CHECK_MEMBER(lmv_desc, ld_default_hash_size);
+       CHECK_MEMBER(lmv_desc, ld_padding_1);
+       CHECK_MEMBER(lmv_desc, ld_padding_2);
+       CHECK_MEMBER(lmv_desc, ld_qos_maxage);
+       CHECK_MEMBER(lmv_desc, ld_padding_3);
+       CHECK_MEMBER(lmv_desc, ld_padding_4);
+       CHECK_MEMBER(lmv_desc, ld_uuid);
 }
 
 static void
 check_lmv_stripe_md(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lmv_stripe_md);
-        CHECK_MEMBER(lmv_stripe_md, mea_magic);
-        CHECK_MEMBER(lmv_stripe_md, mea_count);
-        CHECK_MEMBER(lmv_stripe_md, mea_master);
-        CHECK_MEMBER(lmv_stripe_md, mea_padding);
-        CHECK_CVALUE(LOV_MAXPOOLNAME);
-        CHECK_MEMBER(lmv_stripe_md, mea_pool_name[LOV_MAXPOOLNAME]);
-        CHECK_MEMBER(lmv_stripe_md, mea_ids[0]);
+       BLANK_LINE();
+       CHECK_STRUCT(lmv_stripe_md);
+       CHECK_MEMBER(lmv_stripe_md, mea_magic);
+       CHECK_MEMBER(lmv_stripe_md, mea_count);
+       CHECK_MEMBER(lmv_stripe_md, mea_master);
+       CHECK_MEMBER(lmv_stripe_md, mea_padding);
+       CHECK_CVALUE(LOV_MAXPOOLNAME);
+       CHECK_MEMBER(lmv_stripe_md, mea_pool_name[LOV_MAXPOOLNAME]);
+       CHECK_MEMBER(lmv_stripe_md, mea_ids[0]);
 }
 
 static void
 check_lov_desc(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lov_desc);
-        CHECK_MEMBER(lov_desc, ld_tgt_count);
-        CHECK_MEMBER(lov_desc, ld_active_tgt_count);
-        CHECK_MEMBER(lov_desc, ld_default_stripe_count);
-        CHECK_MEMBER(lov_desc, ld_pattern);
-        CHECK_MEMBER(lov_desc, ld_default_stripe_size);
-        CHECK_MEMBER(lov_desc, ld_default_stripe_offset);
-        CHECK_MEMBER(lov_desc, ld_padding_0);
-        CHECK_MEMBER(lov_desc, ld_qos_maxage);
-        CHECK_MEMBER(lov_desc, ld_padding_1);
-        CHECK_MEMBER(lov_desc, ld_padding_2);
-        CHECK_MEMBER(lov_desc, ld_uuid);
+       BLANK_LINE();
+       CHECK_STRUCT(lov_desc);
+       CHECK_MEMBER(lov_desc, ld_tgt_count);
+       CHECK_MEMBER(lov_desc, ld_active_tgt_count);
+       CHECK_MEMBER(lov_desc, ld_default_stripe_count);
+       CHECK_MEMBER(lov_desc, ld_pattern);
+       CHECK_MEMBER(lov_desc, ld_default_stripe_size);
+       CHECK_MEMBER(lov_desc, ld_default_stripe_offset);
+       CHECK_MEMBER(lov_desc, ld_padding_0);
+       CHECK_MEMBER(lov_desc, ld_qos_maxage);
+       CHECK_MEMBER(lov_desc, ld_padding_1);
+       CHECK_MEMBER(lov_desc, ld_padding_2);
+       CHECK_MEMBER(lov_desc, ld_uuid);
 
-        CHECK_CDEFINE(LOV_DESC_MAGIC);
+       CHECK_CDEFINE(LOV_DESC_MAGIC);
 }
 
 static void
 check_ldlm_res_id(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_res_id);
-        CHECK_CVALUE(RES_NAME_SIZE);
-        CHECK_MEMBER(ldlm_res_id, name[RES_NAME_SIZE]);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_res_id);
+       CHECK_CVALUE(RES_NAME_SIZE);
+       CHECK_MEMBER(ldlm_res_id, name[RES_NAME_SIZE]);
 }
 
 static void
 check_ldlm_extent(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_extent);
-        CHECK_MEMBER(ldlm_extent, start);
-        CHECK_MEMBER(ldlm_extent, end);
-        CHECK_MEMBER(ldlm_extent, gid);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_extent);
+       CHECK_MEMBER(ldlm_extent, start);
+       CHECK_MEMBER(ldlm_extent, end);
+       CHECK_MEMBER(ldlm_extent, gid);
 }
 
 static void
 check_ldlm_inodebits(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_inodebits);
-        CHECK_MEMBER(ldlm_inodebits, bits);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_inodebits);
+       CHECK_MEMBER(ldlm_inodebits, bits);
 }
 
 static void
 check_ldlm_flock(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_flock_wire);
-        CHECK_MEMBER(ldlm_flock_wire, lfw_start);
-        CHECK_MEMBER(ldlm_flock_wire, lfw_end);
-        CHECK_MEMBER(ldlm_flock_wire, lfw_owner);
-        CHECK_MEMBER(ldlm_flock_wire, lfw_padding);
-        CHECK_MEMBER(ldlm_flock_wire, lfw_pid);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_flock_wire);
+       CHECK_MEMBER(ldlm_flock_wire, lfw_start);
+       CHECK_MEMBER(ldlm_flock_wire, lfw_end);
+       CHECK_MEMBER(ldlm_flock_wire, lfw_owner);
+       CHECK_MEMBER(ldlm_flock_wire, lfw_padding);
+       CHECK_MEMBER(ldlm_flock_wire, lfw_pid);
 }
 
 static void
 check_ldlm_intent(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_intent);
-        CHECK_MEMBER(ldlm_intent, opc);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_intent);
+       CHECK_MEMBER(ldlm_intent, opc);
 }
 
 static void
 check_ldlm_resource_desc(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_resource_desc);
-        CHECK_MEMBER(ldlm_resource_desc, lr_type);
-        CHECK_MEMBER(ldlm_resource_desc, lr_padding);
-        CHECK_MEMBER(ldlm_resource_desc, lr_name);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_resource_desc);
+       CHECK_MEMBER(ldlm_resource_desc, lr_type);
+       CHECK_MEMBER(ldlm_resource_desc, lr_padding);
+       CHECK_MEMBER(ldlm_resource_desc, lr_name);
 }
 
 static void
 check_ldlm_lock_desc(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_lock_desc);
-        CHECK_MEMBER(ldlm_lock_desc, l_resource);
-        CHECK_MEMBER(ldlm_lock_desc, l_req_mode);
-        CHECK_MEMBER(ldlm_lock_desc, l_granted_mode);
-        CHECK_MEMBER(ldlm_lock_desc, l_policy_data);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_lock_desc);
+       CHECK_MEMBER(ldlm_lock_desc, l_resource);
+       CHECK_MEMBER(ldlm_lock_desc, l_req_mode);
+       CHECK_MEMBER(ldlm_lock_desc, l_granted_mode);
+       CHECK_MEMBER(ldlm_lock_desc, l_policy_data);
 }
 
 static void
 check_ldlm_request(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_request);
-        CHECK_MEMBER(ldlm_request, lock_flags);
-        CHECK_MEMBER(ldlm_request, lock_count);
-        CHECK_MEMBER(ldlm_request, lock_desc);
-        CHECK_MEMBER(ldlm_request, lock_handle);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_request);
+       CHECK_MEMBER(ldlm_request, lock_flags);
+       CHECK_MEMBER(ldlm_request, lock_count);
+       CHECK_MEMBER(ldlm_request, lock_desc);
+       CHECK_MEMBER(ldlm_request, lock_handle);
 }
 
 static void
 check_ldlm_reply(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ldlm_reply);
-        CHECK_MEMBER(ldlm_reply, lock_flags);
-        CHECK_MEMBER(ldlm_reply, lock_padding);
-        CHECK_MEMBER(ldlm_reply, lock_desc);
-        CHECK_MEMBER(ldlm_reply, lock_handle);
-        CHECK_MEMBER(ldlm_reply, lock_policy_res1);
-        CHECK_MEMBER(ldlm_reply, lock_policy_res2);
+       BLANK_LINE();
+       CHECK_STRUCT(ldlm_reply);
+       CHECK_MEMBER(ldlm_reply, lock_flags);
+       CHECK_MEMBER(ldlm_reply, lock_padding);
+       CHECK_MEMBER(ldlm_reply, lock_desc);
+       CHECK_MEMBER(ldlm_reply, lock_handle);
+       CHECK_MEMBER(ldlm_reply, lock_policy_res1);
+       CHECK_MEMBER(ldlm_reply, lock_policy_res2);
 }
 
 static void
@@ -1389,35 +1386,35 @@ check_ldlm_gl_lquota_desc(void)
 static void
 check_mgs_send_param(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mgs_send_param);
-        CHECK_CVALUE(MGS_PARAM_MAXLEN);
-        CHECK_MEMBER(mgs_send_param, mgs_param[MGS_PARAM_MAXLEN]);
+       BLANK_LINE();
+       CHECK_STRUCT(mgs_send_param);
+       CHECK_CVALUE(MGS_PARAM_MAXLEN);
+       CHECK_MEMBER(mgs_send_param, mgs_param[MGS_PARAM_MAXLEN]);
 }
 
 static void
 check_cfg_marker(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(cfg_marker);
-        CHECK_MEMBER(cfg_marker, cm_step);
-        CHECK_MEMBER(cfg_marker, cm_flags);
-        CHECK_MEMBER(cfg_marker, cm_vers);
-        CHECK_MEMBER(cfg_marker, cm_padding);
-        CHECK_MEMBER(cfg_marker, cm_createtime);
-        CHECK_MEMBER(cfg_marker, cm_canceltime);
-        CHECK_MEMBER(cfg_marker, cm_tgtname);
-        CHECK_MEMBER(cfg_marker, cm_comment);
+       BLANK_LINE();
+       CHECK_STRUCT(cfg_marker);
+       CHECK_MEMBER(cfg_marker, cm_step);
+       CHECK_MEMBER(cfg_marker, cm_flags);
+       CHECK_MEMBER(cfg_marker, cm_vers);
+       CHECK_MEMBER(cfg_marker, cm_padding);
+       CHECK_MEMBER(cfg_marker, cm_createtime);
+       CHECK_MEMBER(cfg_marker, cm_canceltime);
+       CHECK_MEMBER(cfg_marker, cm_tgtname);
+       CHECK_MEMBER(cfg_marker, cm_comment);
 }
 
 static void
 check_llog_logid(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_logid);
-        CHECK_MEMBER(llog_logid, lgl_oid);
-        CHECK_MEMBER(llog_logid, lgl_oseq);
-        CHECK_MEMBER(llog_logid, lgl_ogen);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_logid);
+       CHECK_MEMBER(llog_logid, lgl_oid);
+       CHECK_MEMBER(llog_logid, lgl_oseq);
+       CHECK_MEMBER(llog_logid, lgl_ogen);
 
        CHECK_CVALUE(OST_SZ_REC);
        CHECK_CVALUE(MDS_UNLINK_REC);
@@ -1434,57 +1431,57 @@ check_llog_logid(void)
 static void
 check_llog_catid(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_catid);
-        CHECK_MEMBER(llog_catid, lci_logid);
-        CHECK_MEMBER(llog_catid, lci_padding1);
-        CHECK_MEMBER(llog_catid, lci_padding2);
-        CHECK_MEMBER(llog_catid, lci_padding3);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_catid);
+       CHECK_MEMBER(llog_catid, lci_logid);
+       CHECK_MEMBER(llog_catid, lci_padding1);
+       CHECK_MEMBER(llog_catid, lci_padding2);
+       CHECK_MEMBER(llog_catid, lci_padding3);
 }
 
 static void
 check_llog_rec_hdr(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_rec_hdr);
-        CHECK_MEMBER(llog_rec_hdr, lrh_len);
-        CHECK_MEMBER(llog_rec_hdr, lrh_index);
-        CHECK_MEMBER(llog_rec_hdr, lrh_type);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_rec_hdr);
+       CHECK_MEMBER(llog_rec_hdr, lrh_len);
+       CHECK_MEMBER(llog_rec_hdr, lrh_index);
+       CHECK_MEMBER(llog_rec_hdr, lrh_type);
        CHECK_MEMBER(llog_rec_hdr, lrh_id);
 }
 
 static void
 check_llog_rec_tail(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_rec_tail);
-        CHECK_MEMBER(llog_rec_tail, lrt_len);
-        CHECK_MEMBER(llog_rec_tail, lrt_index);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_rec_tail);
+       CHECK_MEMBER(llog_rec_tail, lrt_len);
+       CHECK_MEMBER(llog_rec_tail, lrt_index);
 }
 
 static void
 check_llog_logid_rec(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_logid_rec);
-        CHECK_MEMBER(llog_logid_rec, lid_hdr);
-        CHECK_MEMBER(llog_logid_rec, lid_id);
-        CHECK_MEMBER(llog_logid_rec, lid_padding1);
-        CHECK_MEMBER(llog_logid_rec, lid_padding2);
-        CHECK_MEMBER(llog_logid_rec, lid_padding3);
-        CHECK_MEMBER(llog_logid_rec, lid_tail);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_logid_rec);
+       CHECK_MEMBER(llog_logid_rec, lid_hdr);
+       CHECK_MEMBER(llog_logid_rec, lid_id);
+       CHECK_MEMBER(llog_logid_rec, lid_padding1);
+       CHECK_MEMBER(llog_logid_rec, lid_padding2);
+       CHECK_MEMBER(llog_logid_rec, lid_padding3);
+       CHECK_MEMBER(llog_logid_rec, lid_tail);
 }
 
 static void
 check_llog_unlink_rec(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_unlink_rec);
-        CHECK_MEMBER(llog_unlink_rec, lur_hdr);
-        CHECK_MEMBER(llog_unlink_rec, lur_oid);
-        CHECK_MEMBER(llog_unlink_rec, lur_oseq);
-        CHECK_MEMBER(llog_unlink_rec, lur_count);
-        CHECK_MEMBER(llog_unlink_rec, lur_tail);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_unlink_rec);
+       CHECK_MEMBER(llog_unlink_rec, lur_hdr);
+       CHECK_MEMBER(llog_unlink_rec, lur_oid);
+       CHECK_MEMBER(llog_unlink_rec, lur_oseq);
+       CHECK_MEMBER(llog_unlink_rec, lur_count);
+       CHECK_MEMBER(llog_unlink_rec, lur_tail);
 }
 
 static void
@@ -1503,15 +1500,15 @@ check_llog_unlink64_rec(void)
 static void
 check_llog_setattr64_rec(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_setattr64_rec);
-        CHECK_MEMBER(llog_setattr64_rec, lsr_hdr);
-        CHECK_MEMBER(llog_setattr64_rec, lsr_oid);
-        CHECK_MEMBER(llog_setattr64_rec, lsr_oseq);
-        CHECK_MEMBER(llog_setattr64_rec, lsr_uid);
-        CHECK_MEMBER(llog_setattr64_rec, lsr_uid_h);
-        CHECK_MEMBER(llog_setattr64_rec, lsr_gid);
-        CHECK_MEMBER(llog_setattr64_rec, lsr_gid_h);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_setattr64_rec);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_hdr);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_oid);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_oseq);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_uid);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_uid_h);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_gid);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_gid_h);
        CHECK_MEMBER(llog_setattr64_rec, lsr_padding);
        CHECK_MEMBER(llog_setattr64_rec, lsr_tail);
 }
@@ -1533,16 +1530,16 @@ check_llog_size_change_rec(void)
 static void
 check_changelog_rec(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(changelog_rec);
-        CHECK_MEMBER(changelog_rec, cr_namelen);
-        CHECK_MEMBER(changelog_rec, cr_flags);
-        CHECK_MEMBER(changelog_rec, cr_type);
-        CHECK_MEMBER(changelog_rec, cr_index);
-        CHECK_MEMBER(changelog_rec, cr_prev);
-        CHECK_MEMBER(changelog_rec, cr_time);
-        CHECK_MEMBER(changelog_rec, cr_tfid);
-        CHECK_MEMBER(changelog_rec, cr_pfid);
+       BLANK_LINE();
+       CHECK_STRUCT(changelog_rec);
+       CHECK_MEMBER(changelog_rec, cr_namelen);
+       CHECK_MEMBER(changelog_rec, cr_flags);
+       CHECK_MEMBER(changelog_rec, cr_type);
+       CHECK_MEMBER(changelog_rec, cr_index);
+       CHECK_MEMBER(changelog_rec, cr_prev);
+       CHECK_MEMBER(changelog_rec, cr_time);
+       CHECK_MEMBER(changelog_rec, cr_tfid);
+       CHECK_MEMBER(changelog_rec, cr_pfid);
 }
 
 static void
@@ -1565,126 +1562,126 @@ check_changelog_rec_ext(void)
 static void
 check_changelog_setinfo(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(changelog_setinfo);
-        CHECK_MEMBER(changelog_setinfo, cs_recno);
-        CHECK_MEMBER(changelog_setinfo, cs_id);
+       BLANK_LINE();
+       CHECK_STRUCT(changelog_setinfo);
+       CHECK_MEMBER(changelog_setinfo, cs_recno);
+       CHECK_MEMBER(changelog_setinfo, cs_id);
 }
 
 static void
 check_llog_changelog_rec(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_changelog_rec);
-        CHECK_MEMBER(llog_changelog_rec, cr_hdr);
-        CHECK_MEMBER(llog_changelog_rec, cr);
-        CHECK_MEMBER(llog_changelog_rec, cr_tail);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_changelog_rec);
+       CHECK_MEMBER(llog_changelog_rec, cr_hdr);
+       CHECK_MEMBER(llog_changelog_rec, cr);
+       CHECK_MEMBER(llog_changelog_rec, cr_tail);
 }
 
 static void
 check_llog_changelog_user_rec(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_changelog_user_rec);
-        CHECK_MEMBER(llog_changelog_user_rec, cur_hdr);
-        CHECK_MEMBER(llog_changelog_user_rec, cur_id);
-        CHECK_MEMBER(llog_changelog_user_rec, cur_padding);
-        CHECK_MEMBER(llog_changelog_user_rec, cur_endrec);
-        CHECK_MEMBER(llog_changelog_user_rec, cur_tail);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_changelog_user_rec);
+       CHECK_MEMBER(llog_changelog_user_rec, cur_hdr);
+       CHECK_MEMBER(llog_changelog_user_rec, cur_id);
+       CHECK_MEMBER(llog_changelog_user_rec, cur_padding);
+       CHECK_MEMBER(llog_changelog_user_rec, cur_endrec);
+       CHECK_MEMBER(llog_changelog_user_rec, cur_tail);
 }
 
 static void
 check_llog_gen(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_gen);
-        CHECK_MEMBER(llog_gen, mnt_cnt);
-        CHECK_MEMBER(llog_gen, conn_cnt);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_gen);
+       CHECK_MEMBER(llog_gen, mnt_cnt);
+       CHECK_MEMBER(llog_gen, conn_cnt);
 }
 
 static void
 check_llog_gen_rec(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_gen_rec);
-        CHECK_MEMBER(llog_gen_rec, lgr_hdr);
-        CHECK_MEMBER(llog_gen_rec, lgr_gen);
-        CHECK_MEMBER(llog_gen_rec, lgr_tail);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_gen_rec);
+       CHECK_MEMBER(llog_gen_rec, lgr_hdr);
+       CHECK_MEMBER(llog_gen_rec, lgr_gen);
+       CHECK_MEMBER(llog_gen_rec, lgr_tail);
 }
 
 static void
 check_llog_log_hdr(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_log_hdr);
-        CHECK_MEMBER(llog_log_hdr, llh_hdr);
-        CHECK_MEMBER(llog_log_hdr, llh_timestamp);
-        CHECK_MEMBER(llog_log_hdr, llh_count);
-        CHECK_MEMBER(llog_log_hdr, llh_bitmap_offset);
-        CHECK_MEMBER(llog_log_hdr, llh_size);
-        CHECK_MEMBER(llog_log_hdr, llh_flags);
-        CHECK_MEMBER(llog_log_hdr, llh_cat_idx);
-        CHECK_MEMBER(llog_log_hdr, llh_tgtuuid);
-        CHECK_MEMBER(llog_log_hdr, llh_reserved);
-        CHECK_MEMBER(llog_log_hdr, llh_bitmap);
-        CHECK_MEMBER(llog_log_hdr, llh_tail);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_log_hdr);
+       CHECK_MEMBER(llog_log_hdr, llh_hdr);
+       CHECK_MEMBER(llog_log_hdr, llh_timestamp);
+       CHECK_MEMBER(llog_log_hdr, llh_count);
+       CHECK_MEMBER(llog_log_hdr, llh_bitmap_offset);
+       CHECK_MEMBER(llog_log_hdr, llh_size);
+       CHECK_MEMBER(llog_log_hdr, llh_flags);
+       CHECK_MEMBER(llog_log_hdr, llh_cat_idx);
+       CHECK_MEMBER(llog_log_hdr, llh_tgtuuid);
+       CHECK_MEMBER(llog_log_hdr, llh_reserved);
+       CHECK_MEMBER(llog_log_hdr, llh_bitmap);
+       CHECK_MEMBER(llog_log_hdr, llh_tail);
 }
 
 static void
 check_llog_cookie(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llog_cookie);
-        CHECK_MEMBER(llog_cookie, lgc_lgl);
-        CHECK_MEMBER(llog_cookie, lgc_subsys);
-        CHECK_MEMBER(llog_cookie, lgc_index);
-        CHECK_MEMBER(llog_cookie, lgc_padding);
+       BLANK_LINE();
+       CHECK_STRUCT(llog_cookie);
+       CHECK_MEMBER(llog_cookie, lgc_lgl);
+       CHECK_MEMBER(llog_cookie, lgc_subsys);
+       CHECK_MEMBER(llog_cookie, lgc_index);
+       CHECK_MEMBER(llog_cookie, lgc_padding);
 }
 
 static void
 check_llogd_body(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llogd_body);
-        CHECK_MEMBER(llogd_body, lgd_logid);
-        CHECK_MEMBER(llogd_body, lgd_ctxt_idx);
-        CHECK_MEMBER(llogd_body, lgd_llh_flags);
-        CHECK_MEMBER(llogd_body, lgd_index);
-        CHECK_MEMBER(llogd_body, lgd_saved_index);
-        CHECK_MEMBER(llogd_body, lgd_len);
-        CHECK_MEMBER(llogd_body, lgd_cur_offset);
-
-        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CREATE);
-        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_NEXT_BLOCK);
-        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_READ_HEADER);
-        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_WRITE_REC);
-        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CLOSE);
-        CHECK_CVALUE(LLOG_ORIGIN_CONNECT);
-        CHECK_CVALUE(LLOG_CATINFO);
-        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_PREV_BLOCK);
-        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_DESTROY);
-        CHECK_CVALUE(LLOG_FIRST_OPC);
-        CHECK_CVALUE(LLOG_LAST_OPC);
+       BLANK_LINE();
+       CHECK_STRUCT(llogd_body);
+       CHECK_MEMBER(llogd_body, lgd_logid);
+       CHECK_MEMBER(llogd_body, lgd_ctxt_idx);
+       CHECK_MEMBER(llogd_body, lgd_llh_flags);
+       CHECK_MEMBER(llogd_body, lgd_index);
+       CHECK_MEMBER(llogd_body, lgd_saved_index);
+       CHECK_MEMBER(llogd_body, lgd_len);
+       CHECK_MEMBER(llogd_body, lgd_cur_offset);
+
+       CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CREATE);
+       CHECK_CVALUE(LLOG_ORIGIN_HANDLE_NEXT_BLOCK);
+       CHECK_CVALUE(LLOG_ORIGIN_HANDLE_READ_HEADER);
+       CHECK_CVALUE(LLOG_ORIGIN_HANDLE_WRITE_REC);
+       CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CLOSE);
+       CHECK_CVALUE(LLOG_ORIGIN_CONNECT);
+       CHECK_CVALUE(LLOG_CATINFO);
+       CHECK_CVALUE(LLOG_ORIGIN_HANDLE_PREV_BLOCK);
+       CHECK_CVALUE(LLOG_ORIGIN_HANDLE_DESTROY);
+       CHECK_CVALUE(LLOG_FIRST_OPC);
+       CHECK_CVALUE(LLOG_LAST_OPC);
 }
 
 static void
 check_llogd_conn_body(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(llogd_conn_body);
-        CHECK_MEMBER(llogd_conn_body, lgdc_gen);
-        CHECK_MEMBER(llogd_conn_body, lgdc_logid);
-        CHECK_MEMBER(llogd_conn_body, lgdc_ctxt_idx);
+       BLANK_LINE();
+       CHECK_STRUCT(llogd_conn_body);
+       CHECK_MEMBER(llogd_conn_body, lgdc_gen);
+       CHECK_MEMBER(llogd_conn_body, lgdc_logid);
+       CHECK_MEMBER(llogd_conn_body, lgdc_ctxt_idx);
 }
 
 static void
 check_ll_fiemap_info_key(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ll_fiemap_info_key);
-        CHECK_MEMBER(ll_fiemap_info_key, name[8]);
-        CHECK_MEMBER(ll_fiemap_info_key, oa);
-        CHECK_MEMBER(ll_fiemap_info_key, fiemap);
+       BLANK_LINE();
+       CHECK_STRUCT(ll_fiemap_info_key);
+       CHECK_MEMBER(ll_fiemap_info_key, name[8]);
+       CHECK_MEMBER(ll_fiemap_info_key, oa);
+       CHECK_MEMBER(ll_fiemap_info_key, fiemap);
 }
 
 static void
@@ -1707,178 +1704,237 @@ check_quota_body(void)
 static void
 check_mgs_target_info(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(mgs_target_info);
-        CHECK_MEMBER(mgs_target_info, mti_lustre_ver);
-        CHECK_MEMBER(mgs_target_info, mti_stripe_index);
-        CHECK_MEMBER(mgs_target_info, mti_config_ver);
-        CHECK_MEMBER(mgs_target_info, mti_flags);
-        CHECK_MEMBER(mgs_target_info, mti_nid_count);
-        CHECK_MEMBER(mgs_target_info, mti_instance);
-        CHECK_MEMBER(mgs_target_info, mti_fsname);
-        CHECK_MEMBER(mgs_target_info, mti_svname);
-        CHECK_MEMBER(mgs_target_info, mti_uuid);
-        CHECK_MEMBER(mgs_target_info, mti_nids);
-        CHECK_MEMBER(mgs_target_info, mti_params);
+       BLANK_LINE();
+       CHECK_STRUCT(mgs_target_info);
+       CHECK_MEMBER(mgs_target_info, mti_lustre_ver);
+       CHECK_MEMBER(mgs_target_info, mti_stripe_index);
+       CHECK_MEMBER(mgs_target_info, mti_config_ver);
+       CHECK_MEMBER(mgs_target_info, mti_flags);
+       CHECK_MEMBER(mgs_target_info, mti_nid_count);
+       CHECK_MEMBER(mgs_target_info, mti_instance);
+       CHECK_MEMBER(mgs_target_info, mti_fsname);
+       CHECK_MEMBER(mgs_target_info, mti_svname);
+       CHECK_MEMBER(mgs_target_info, mti_uuid);
+       CHECK_MEMBER(mgs_target_info, mti_nids);
+       CHECK_MEMBER(mgs_target_info, mti_params);
 }
 
 static void
 check_lustre_capa(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lustre_capa);
-        CHECK_MEMBER(lustre_capa, lc_fid);
-        CHECK_MEMBER(lustre_capa, lc_opc);
-        CHECK_MEMBER(lustre_capa, lc_uid);
-        CHECK_MEMBER(lustre_capa, lc_gid);
-        CHECK_MEMBER(lustre_capa, lc_flags);
-        CHECK_MEMBER(lustre_capa, lc_keyid);
-        CHECK_MEMBER(lustre_capa, lc_timeout);
-        CHECK_MEMBER(lustre_capa, lc_expiry);
-        CHECK_CVALUE(CAPA_HMAC_MAX_LEN);
-        CHECK_MEMBER(lustre_capa, lc_hmac[CAPA_HMAC_MAX_LEN]);
+       BLANK_LINE();
+       CHECK_STRUCT(lustre_capa);
+       CHECK_MEMBER(lustre_capa, lc_fid);
+       CHECK_MEMBER(lustre_capa, lc_opc);
+       CHECK_MEMBER(lustre_capa, lc_uid);
+       CHECK_MEMBER(lustre_capa, lc_gid);
+       CHECK_MEMBER(lustre_capa, lc_flags);
+       CHECK_MEMBER(lustre_capa, lc_keyid);
+       CHECK_MEMBER(lustre_capa, lc_timeout);
+       CHECK_MEMBER(lustre_capa, lc_expiry);
+       CHECK_CVALUE(CAPA_HMAC_MAX_LEN);
+       CHECK_MEMBER(lustre_capa, lc_hmac[CAPA_HMAC_MAX_LEN]);
 }
 
 static void
 check_lustre_capa_key(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(lustre_capa_key);
-        CHECK_MEMBER(lustre_capa_key, lk_seq);
-        CHECK_MEMBER(lustre_capa_key, lk_keyid);
-        CHECK_MEMBER(lustre_capa_key, lk_padding);
-        CHECK_CVALUE(CAPA_HMAC_KEY_MAX_LEN);
-        CHECK_MEMBER(lustre_capa_key, lk_key[CAPA_HMAC_KEY_MAX_LEN]);
+       BLANK_LINE();
+       CHECK_STRUCT(lustre_capa_key);
+       CHECK_MEMBER(lustre_capa_key, lk_seq);
+       CHECK_MEMBER(lustre_capa_key, lk_keyid);
+       CHECK_MEMBER(lustre_capa_key, lk_padding);
+       CHECK_CVALUE(CAPA_HMAC_KEY_MAX_LEN);
+       CHECK_MEMBER(lustre_capa_key, lk_key[CAPA_HMAC_KEY_MAX_LEN]);
 }
 
 static void
 check_getinfo_fid2path(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(getinfo_fid2path);
-        CHECK_MEMBER(getinfo_fid2path, gf_fid);
-        CHECK_MEMBER(getinfo_fid2path, gf_recno);
-        CHECK_MEMBER(getinfo_fid2path, gf_linkno);
-        CHECK_MEMBER(getinfo_fid2path, gf_pathlen);
-        CHECK_MEMBER(getinfo_fid2path, gf_path[0]);
+       BLANK_LINE();
+       CHECK_STRUCT(getinfo_fid2path);
+       CHECK_MEMBER(getinfo_fid2path, gf_fid);
+       CHECK_MEMBER(getinfo_fid2path, gf_recno);
+       CHECK_MEMBER(getinfo_fid2path, gf_linkno);
+       CHECK_MEMBER(getinfo_fid2path, gf_pathlen);
+       CHECK_MEMBER(getinfo_fid2path, gf_path[0]);
 }
 
 static void
 check_posix_acl_xattr_entry(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT_TYPEDEF(posix_acl_xattr_entry);
-        CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_tag);
-        CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_perm);
-        CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_id);
+       BLANK_LINE();
+       CHECK_STRUCT_TYPEDEF(posix_acl_xattr_entry);
+       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_tag);
+       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_perm);
+       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_id);
 }
 
 static void
 check_posix_acl_xattr_header(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT_TYPEDEF(posix_acl_xattr_header);
-        CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_version);
-        CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_entries);
+       BLANK_LINE();
+       CHECK_STRUCT_TYPEDEF(posix_acl_xattr_header);
+       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_version);
+       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_entries);
 }
 
 static void
 check_ll_user_fiemap(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ll_user_fiemap);
-        CHECK_MEMBER(ll_user_fiemap, fm_start);
-        CHECK_MEMBER(ll_user_fiemap, fm_length);
-        CHECK_MEMBER(ll_user_fiemap, fm_flags);
-        CHECK_MEMBER(ll_user_fiemap, fm_mapped_extents);
-        CHECK_MEMBER(ll_user_fiemap, fm_extent_count);
-        CHECK_MEMBER(ll_user_fiemap, fm_reserved);
-        CHECK_MEMBER(ll_user_fiemap, fm_extents);
+       BLANK_LINE();
+       CHECK_STRUCT(ll_user_fiemap);
+       CHECK_MEMBER(ll_user_fiemap, fm_start);
+       CHECK_MEMBER(ll_user_fiemap, fm_length);
+       CHECK_MEMBER(ll_user_fiemap, fm_flags);
+       CHECK_MEMBER(ll_user_fiemap, fm_mapped_extents);
+       CHECK_MEMBER(ll_user_fiemap, fm_extent_count);
+       CHECK_MEMBER(ll_user_fiemap, fm_reserved);
+       CHECK_MEMBER(ll_user_fiemap, fm_extents);
 
-        CHECK_CDEFINE(FIEMAP_FLAG_SYNC);
-        CHECK_CDEFINE(FIEMAP_FLAG_XATTR);
-        CHECK_CDEFINE(FIEMAP_FLAG_DEVICE_ORDER);
+       CHECK_CDEFINE(FIEMAP_FLAG_SYNC);
+       CHECK_CDEFINE(FIEMAP_FLAG_XATTR);
+       CHECK_CDEFINE(FIEMAP_FLAG_DEVICE_ORDER);
 }
 
 static void
 check_ll_fiemap_extent(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(ll_fiemap_extent);
-        CHECK_MEMBER(ll_fiemap_extent, fe_logical);
-        CHECK_MEMBER(ll_fiemap_extent, fe_physical);
-        CHECK_MEMBER(ll_fiemap_extent, fe_length);
-        CHECK_MEMBER(ll_fiemap_extent, fe_flags);
-        CHECK_MEMBER(ll_fiemap_extent, fe_device);
-
-        CHECK_CDEFINE(FIEMAP_EXTENT_LAST);
-        CHECK_CDEFINE(FIEMAP_EXTENT_UNKNOWN);
-        CHECK_CDEFINE(FIEMAP_EXTENT_DELALLOC);
-        CHECK_CDEFINE(FIEMAP_EXTENT_ENCODED);
-        CHECK_CDEFINE(FIEMAP_EXTENT_DATA_ENCRYPTED);
-        CHECK_CDEFINE(FIEMAP_EXTENT_NOT_ALIGNED);
-        CHECK_CDEFINE(FIEMAP_EXTENT_DATA_INLINE);
-        CHECK_CDEFINE(FIEMAP_EXTENT_DATA_TAIL);
-        CHECK_CDEFINE(FIEMAP_EXTENT_UNWRITTEN);
-        CHECK_CDEFINE(FIEMAP_EXTENT_MERGED);
-        CHECK_CDEFINE(FIEMAP_EXTENT_NO_DIRECT);
-        CHECK_CDEFINE(FIEMAP_EXTENT_NET);
+       BLANK_LINE();
+       CHECK_STRUCT(ll_fiemap_extent);
+       CHECK_MEMBER(ll_fiemap_extent, fe_logical);
+       CHECK_MEMBER(ll_fiemap_extent, fe_physical);
+       CHECK_MEMBER(ll_fiemap_extent, fe_length);
+       CHECK_MEMBER(ll_fiemap_extent, fe_flags);
+       CHECK_MEMBER(ll_fiemap_extent, fe_device);
+
+       CHECK_CDEFINE(FIEMAP_EXTENT_LAST);
+       CHECK_CDEFINE(FIEMAP_EXTENT_UNKNOWN);
+       CHECK_CDEFINE(FIEMAP_EXTENT_DELALLOC);
+       CHECK_CDEFINE(FIEMAP_EXTENT_ENCODED);
+       CHECK_CDEFINE(FIEMAP_EXTENT_DATA_ENCRYPTED);
+       CHECK_CDEFINE(FIEMAP_EXTENT_NOT_ALIGNED);
+       CHECK_CDEFINE(FIEMAP_EXTENT_DATA_INLINE);
+       CHECK_CDEFINE(FIEMAP_EXTENT_DATA_TAIL);
+       CHECK_CDEFINE(FIEMAP_EXTENT_UNWRITTEN);
+       CHECK_CDEFINE(FIEMAP_EXTENT_MERGED);
+       CHECK_CDEFINE(FIEMAP_EXTENT_NO_DIRECT);
+       CHECK_CDEFINE(FIEMAP_EXTENT_NET);
 }
 
 static void
 check_link_ea_header(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(link_ea_header);
-        CHECK_MEMBER(link_ea_header, leh_magic);
-        CHECK_MEMBER(link_ea_header, leh_reccount);
-        CHECK_MEMBER(link_ea_header, leh_len);
-        CHECK_MEMBER(link_ea_header, padding1);
-        CHECK_MEMBER(link_ea_header, padding2);
+       BLANK_LINE();
+       CHECK_STRUCT(link_ea_header);
+       CHECK_MEMBER(link_ea_header, leh_magic);
+       CHECK_MEMBER(link_ea_header, leh_reccount);
+       CHECK_MEMBER(link_ea_header, leh_len);
+       CHECK_MEMBER(link_ea_header, padding1);
+       CHECK_MEMBER(link_ea_header, padding2);
 
-        CHECK_CDEFINE(LINK_EA_MAGIC);
+       CHECK_CDEFINE(LINK_EA_MAGIC);
 }
 
 static void
 check_link_ea_entry(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(link_ea_entry);
-        CHECK_MEMBER(link_ea_entry, lee_reclen);
-        CHECK_MEMBER(link_ea_entry, lee_parent_fid);
-        CHECK_MEMBER(link_ea_entry, lee_name);
+       BLANK_LINE();
+       CHECK_STRUCT(link_ea_entry);
+       CHECK_MEMBER(link_ea_entry, lee_reclen);
+       CHECK_MEMBER(link_ea_entry, lee_parent_fid);
+       CHECK_MEMBER(link_ea_entry, lee_name);
 }
 
 static void
 check_hsm_user_item(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(hsm_user_item);
-        CHECK_MEMBER(hsm_user_item, hui_fid);
-        CHECK_MEMBER(hsm_user_item, hui_extent);
+       BLANK_LINE();
+       CHECK_STRUCT(hsm_user_item);
+       CHECK_MEMBER(hsm_user_item, hui_fid);
+       CHECK_MEMBER(hsm_user_item, hui_extent);
 }
 
 static void
-check_hsm_user_request(void)
+check_hsm_user_state(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(hsm_user_request);
-        CHECK_MEMBER(hsm_user_request, hur_action);
-        CHECK_MEMBER(hsm_user_request, hur_archive_num);
-        CHECK_MEMBER(hsm_user_request, hur_itemcount);
-        CHECK_MEMBER(hsm_user_request, hur_data_len);
+       BLANK_LINE();
+       CHECK_STRUCT(hsm_user_state);
+       CHECK_MEMBER(hsm_user_state, hus_states);
+       CHECK_MEMBER(hsm_user_state, hus_archive_num);
+       CHECK_MEMBER(hsm_user_state, hus_in_progress_state);
+       CHECK_MEMBER(hsm_user_state, hus_in_progress_action);
+       CHECK_MEMBER(hsm_user_state, hus_in_progress_location);
 }
 
 static void
-check_hsm_user_state(void)
+check_hsm_action_item(void)
 {
-        BLANK_LINE();
-        CHECK_STRUCT(hsm_user_state);
-        CHECK_MEMBER(hsm_user_state, hus_states);
-        CHECK_MEMBER(hsm_user_state, hus_archive_num);
-        CHECK_MEMBER(hsm_user_state, hus_in_progress_state);
-        CHECK_MEMBER(hsm_user_state, hus_in_progress_action);
-        CHECK_MEMBER(hsm_user_state, hus_in_progress_location);
+       BLANK_LINE();
+       CHECK_STRUCT(hsm_action_item);
+       CHECK_MEMBER(hsm_action_item, hai_len);
+       CHECK_MEMBER(hsm_action_item, hai_action);
+       CHECK_MEMBER(hsm_action_item, hai_fid);
+       CHECK_MEMBER(hsm_action_item, hai_dfid);
+       CHECK_MEMBER(hsm_action_item, hai_extent);
+       CHECK_MEMBER(hsm_action_item, hai_cookie);
+       CHECK_MEMBER(hsm_action_item, hai_gid);
+       CHECK_MEMBER(hsm_action_item, hai_data);
+}
+
+static void
+check_hsm_action_list(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(hsm_action_list);
+       CHECK_MEMBER(hsm_action_list, hal_version);
+       CHECK_MEMBER(hsm_action_list, hal_count);
+       CHECK_MEMBER(hsm_action_list, hal_compound_id);
+       CHECK_MEMBER(hsm_action_list, hal_flags);
+       CHECK_MEMBER(hsm_action_list, hal_archive_num);
+       CHECK_MEMBER(hsm_action_list, padding1);
+       CHECK_MEMBER(hsm_action_list, hal_fsname);
+}
+
+static void
+check_hsm_progress_kernel(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(hsm_progress_kernel);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_fid);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_cookie);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_extent);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_flags);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_errval);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_padding1);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_data_version);
+       CHECK_MEMBER(hsm_progress_kernel, hpk_padding2);
+}
+
+static void
+check_hsm_progress(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(hsm_progress);
+       CHECK_MEMBER(hsm_progress, hp_fid);
+       CHECK_MEMBER(hsm_progress, hp_cookie);
+       CHECK_MEMBER(hsm_progress, hp_extent);
+       CHECK_MEMBER(hsm_progress, hp_flags);
+       CHECK_MEMBER(hsm_progress, hp_errval);
+       CHECK_MEMBER(hsm_progress, padding);
+       CHECK_DEFINE_X(HP_FLAG_COMPLETED);
+       CHECK_DEFINE_X(HP_FLAG_RETRY);
+}
+
+static void
+check_hsm_copy(void)
+{
+       BLANK_LINE();
+       CHECK_MEMBER(hsm_copy, hc_data_version);
+       CHECK_MEMBER(hsm_copy, hc_flags);
+       CHECK_MEMBER(hsm_copy, hc_errval);
+       CHECK_MEMBER(hsm_copy, padding);
+       CHECK_MEMBER(hsm_copy, hc_hai);
 }
 
 static void check_layout_intent(void)
@@ -1902,233 +1958,240 @@ static void check_layout_intent(void)
 static void
 system_string (char *cmdline, char *str, int len)
 {
-        int   fds[2];
-        int   rc;
-        pid_t pid;
+       int   fds[2];
+       int   rc;
+       pid_t pid;
 
-        rc = pipe(fds);
-        if (rc != 0)
-                abort();
+       rc = pipe(fds);
+       if (rc != 0)
+               abort();
 
-        pid = fork();
-        if (pid == 0) {
-                /* child */
-                int   fd = fileno(stdout);
+       pid = fork();
+       if (pid == 0) {
+               /* child */
+               int   fd = fileno(stdout);
 
-                rc = dup2(fds[1], fd);
-                if (rc != fd)
-                        abort();
+               rc = dup2(fds[1], fd);
+               if (rc != fd)
+                       abort();
 
-                exit(system(cmdline));
-                /* notreached */
-        } else if ((int)pid < 0) {
-                abort();
-        } else {
-                FILE *f = fdopen(fds[0], "r");
+               exit(system(cmdline));
+               /* notreached */
+       } else if ((int)pid < 0) {
+               abort();
+       } else {
+               FILE *f = fdopen(fds[0], "r");
 
-                if (f == NULL)
-                        abort();
+               if (f == NULL)
+                       abort();
 
-                close(fds[1]);
+               close(fds[1]);
 
-                if (fgets(str, len, f) == NULL)
-                        abort();
+               if (fgets(str, len, f) == NULL)
+                       abort();
 
-                if (waitpid(pid, &rc, 0) != pid)
-                        abort();
+               if (waitpid(pid, &rc, 0) != pid)
+                       abort();
 
-                if (!WIFEXITED(rc) || WEXITSTATUS(rc) != 0)
-                        abort();
+               if (!WIFEXITED(rc) || WEXITSTATUS(rc) != 0)
+                       abort();
 
-                if (strnlen(str, len) == len)
-                        str[len - 1] = 0;
+               if (strnlen(str, len) == len)
+                       str[len - 1] = 0;
 
-                if (str[strlen(str) - 1] == '\n')
-                        str[strlen(str) - 1] = 0;
+               if (str[strlen(str) - 1] == '\n')
+                       str[strlen(str) - 1] = 0;
 
-                fclose(f);
-        }
+               fclose(f);
+       }
 }
 
 int
 main(int argc, char **argv)
 {
-        char unameinfo[80];
-        char gccinfo[80];
-
-        system_string("uname -a", unameinfo, sizeof(unameinfo));
-        system_string(CC " -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo));
-
-        printf ("void lustre_assert_wire_constants(void)\n"
-                "{\n"
-                "        /* Wire protocol assertions generated by 'wirecheck'\n"
-                "         * (make -C lustre/utils newwiretest)\n"
-                "         * running on %s\n"
-                "         * with %s */\n"
-                "\n", unameinfo, gccinfo);
-
-        BLANK_LINE ();
-
-        COMMENT("Constants...");
-        CHECK_VALUE(PTL_RPC_MSG_REQUEST);
-        CHECK_VALUE(PTL_RPC_MSG_ERR);
-        CHECK_VALUE(PTL_RPC_MSG_REPLY);
-
-        CHECK_DEFINE_64X(MDS_DIR_END_OFF);
-
-        CHECK_DEFINE_64X(DEAD_HANDLE_MAGIC);
-
-        CHECK_CVALUE(MTI_NAME_MAXLEN);
-
-        CHECK_VALUE(OST_REPLY);
-        CHECK_VALUE(OST_GETATTR);
-        CHECK_VALUE(OST_SETATTR);
-        CHECK_VALUE(OST_READ);
-        CHECK_VALUE(OST_WRITE);
-        CHECK_VALUE(OST_CREATE);
-        CHECK_VALUE(OST_DESTROY);
-        CHECK_VALUE(OST_GET_INFO);
-        CHECK_VALUE(OST_CONNECT);
-        CHECK_VALUE(OST_DISCONNECT);
-        CHECK_VALUE(OST_PUNCH);
-        CHECK_VALUE(OST_OPEN);
-        CHECK_VALUE(OST_CLOSE);
-        CHECK_VALUE(OST_STATFS);
-        CHECK_VALUE(OST_SYNC);
-        CHECK_VALUE(OST_SET_INFO);
-        CHECK_VALUE(OST_QUOTACHECK);
-        CHECK_VALUE(OST_QUOTACTL);
-        CHECK_VALUE(OST_QUOTA_ADJUST_QUNIT);
-        CHECK_VALUE(OST_LAST_OPC);
-
-        CHECK_DEFINE_64X(OBD_OBJECT_EOF);
-
-        CHECK_VALUE(OST_MIN_PRECREATE);
-        CHECK_VALUE(OST_MAX_PRECREATE);
-
-        CHECK_DEFINE_64X(OST_LVB_ERR_INIT);
-        CHECK_DEFINE_64X(OST_LVB_ERR_MASK);
-
-        CHECK_VALUE(MDS_FIRST_OPC);
-        CHECK_VALUE(MDS_GETATTR);
-        CHECK_VALUE(MDS_GETATTR_NAME);
-        CHECK_VALUE(MDS_CLOSE);
-        CHECK_VALUE(MDS_REINT);
-        CHECK_VALUE(MDS_READPAGE);
-        CHECK_VALUE(MDS_CONNECT);
-        CHECK_VALUE(MDS_DISCONNECT);
-        CHECK_VALUE(MDS_GETSTATUS);
-        CHECK_VALUE(MDS_STATFS);
-        CHECK_VALUE(MDS_PIN);
-        CHECK_VALUE(MDS_UNPIN);
-        CHECK_VALUE(MDS_SYNC);
-        CHECK_VALUE(MDS_DONE_WRITING);
-        CHECK_VALUE(MDS_SET_INFO);
-        CHECK_VALUE(MDS_QUOTACHECK);
-        CHECK_VALUE(MDS_QUOTACTL);
-        CHECK_VALUE(MDS_GETXATTR);
-        CHECK_VALUE(MDS_SETXATTR);
-        CHECK_VALUE(MDS_WRITEPAGE);
-        CHECK_VALUE(MDS_IS_SUBDIR);
-        CHECK_VALUE(MDS_GET_INFO);
-        CHECK_VALUE(MDS_LAST_OPC);
-
-        CHECK_VALUE(REINT_SETATTR);
-        CHECK_VALUE(REINT_CREATE);
-        CHECK_VALUE(REINT_LINK);
-        CHECK_VALUE(REINT_UNLINK);
-        CHECK_VALUE(REINT_RENAME);
-        CHECK_VALUE(REINT_OPEN);
-        CHECK_VALUE(REINT_SETXATTR);
-        CHECK_VALUE(REINT_MAX);
-
-        CHECK_VALUE_X(DISP_IT_EXECD);
-        CHECK_VALUE_X(DISP_LOOKUP_EXECD);
-        CHECK_VALUE_X(DISP_LOOKUP_NEG);
-        CHECK_VALUE_X(DISP_LOOKUP_POS);
-        CHECK_VALUE_X(DISP_OPEN_CREATE);
-        CHECK_VALUE_X(DISP_OPEN_OPEN);
-        CHECK_VALUE_X(DISP_ENQ_COMPLETE);
-        CHECK_VALUE_X(DISP_ENQ_OPEN_REF);
-        CHECK_VALUE_X(DISP_ENQ_CREATE_REF);
-        CHECK_VALUE_X(DISP_OPEN_LOCK);
-
-        CHECK_VALUE(MDS_STATUS_CONN);
-        CHECK_VALUE(MDS_STATUS_LOV);
-
-        CHECK_VALUE(LUSTRE_BFLAG_UNCOMMITTED_WRITES);
-
-        CHECK_VALUE_X(MF_SOM_CHANGE);
-        CHECK_VALUE_X(MF_EPOCH_OPEN);
-        CHECK_VALUE_X(MF_EPOCH_CLOSE);
-        CHECK_VALUE_X(MF_MDC_CANCEL_FID1);
-        CHECK_VALUE_X(MF_MDC_CANCEL_FID2);
-        CHECK_VALUE_X(MF_MDC_CANCEL_FID3);
-        CHECK_VALUE_X(MF_MDC_CANCEL_FID4);
-        CHECK_VALUE_X(MF_SOM_AU);
-        CHECK_VALUE_X(MF_GETATTR_LOCK);
-
-        CHECK_VALUE_64X(MDS_ATTR_MODE);
-        CHECK_VALUE_64X(MDS_ATTR_UID);
-        CHECK_VALUE_64X(MDS_ATTR_GID);
-        CHECK_VALUE_64X(MDS_ATTR_SIZE);
-        CHECK_VALUE_64X(MDS_ATTR_ATIME);
-        CHECK_VALUE_64X(MDS_ATTR_MTIME);
-        CHECK_VALUE_64X(MDS_ATTR_CTIME);
-        CHECK_VALUE_64X(MDS_ATTR_ATIME_SET);
-        CHECK_VALUE_64X(MDS_ATTR_MTIME_SET);
-        CHECK_VALUE_64X(MDS_ATTR_FORCE);
-        CHECK_VALUE_64X(MDS_ATTR_ATTR_FLAG);
-        CHECK_VALUE_64X(MDS_ATTR_KILL_SUID);
-        CHECK_VALUE_64X(MDS_ATTR_KILL_SGID);
-        CHECK_VALUE_64X(MDS_ATTR_CTIME_SET);
-        CHECK_VALUE_64X(MDS_ATTR_FROM_OPEN);
-        CHECK_VALUE_64X(MDS_ATTR_BLOCKS);
-
-        CHECK_VALUE(FLD_QUERY);
-        CHECK_VALUE(FLD_FIRST_OPC);
-        CHECK_VALUE(FLD_LAST_OPC);
-
-        CHECK_VALUE(SEQ_QUERY);
-        CHECK_VALUE(SEQ_FIRST_OPC);
-        CHECK_VALUE(SEQ_LAST_OPC);
-
-        CHECK_VALUE(SEQ_ALLOC_SUPER);
-        CHECK_VALUE(SEQ_ALLOC_META);
-
-        CHECK_VALUE(LDLM_ENQUEUE);
-        CHECK_VALUE(LDLM_CONVERT);
-        CHECK_VALUE(LDLM_CANCEL);
-        CHECK_VALUE(LDLM_BL_CALLBACK);
-        CHECK_VALUE(LDLM_CP_CALLBACK);
-        CHECK_VALUE(LDLM_GL_CALLBACK);
-        CHECK_VALUE(LDLM_SET_INFO);
-        CHECK_VALUE(LDLM_LAST_OPC);
-
-        CHECK_VALUE(LCK_MINMODE);
-        CHECK_VALUE(LCK_EX);
-        CHECK_VALUE(LCK_PW);
-        CHECK_VALUE(LCK_PR);
-        CHECK_VALUE(LCK_CW);
-        CHECK_VALUE(LCK_CR);
-        CHECK_VALUE(LCK_NL);
-        CHECK_VALUE(LCK_GROUP);
-        CHECK_VALUE(LCK_COS);
-        CHECK_VALUE(LCK_MAXMODE);
-        CHECK_VALUE(LCK_MODE_NUM);
-
-        CHECK_CVALUE(LDLM_PLAIN);
-        CHECK_CVALUE(LDLM_EXTENT);
-        CHECK_CVALUE(LDLM_FLOCK);
-        CHECK_CVALUE(LDLM_IBITS);
-        CHECK_CVALUE(LDLM_MAX_TYPE);
-
-        CHECK_CVALUE(LUSTRE_RES_ID_SEQ_OFF);
-        CHECK_CVALUE(LUSTRE_RES_ID_VER_OID_OFF);
-        /* CHECK_CVALUE(LUSTRE_RES_ID_WAS_VER_OFF); packed with OID */
+       char unameinfo[80];
+       char gccinfo[80];
+
+       system_string("uname -a", unameinfo, sizeof(unameinfo));
+       system_string(CC " -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo));
+
+       printf ("void lustre_assert_wire_constants(void)\n"
+               "{\n"
+               "        /* Wire protocol assertions generated by 'wirecheck'\n"
+               "         * (make -C lustre/utils newwiretest)\n"
+               "         * running on %s\n"
+               "         * with %s */\n"
+               "\n", unameinfo, gccinfo);
+
+       BLANK_LINE ();
+
+       COMMENT("Constants...");
+       CHECK_VALUE(PTL_RPC_MSG_REQUEST);
+       CHECK_VALUE(PTL_RPC_MSG_ERR);
+       CHECK_VALUE(PTL_RPC_MSG_REPLY);
+
+       CHECK_DEFINE_64X(MDS_DIR_END_OFF);
+
+       CHECK_DEFINE_64X(DEAD_HANDLE_MAGIC);
+
+       CHECK_CVALUE(MTI_NAME_MAXLEN);
+
+       CHECK_VALUE(OST_REPLY);
+       CHECK_VALUE(OST_GETATTR);
+       CHECK_VALUE(OST_SETATTR);
+       CHECK_VALUE(OST_READ);
+       CHECK_VALUE(OST_WRITE);
+       CHECK_VALUE(OST_CREATE);
+       CHECK_VALUE(OST_DESTROY);
+       CHECK_VALUE(OST_GET_INFO);
+       CHECK_VALUE(OST_CONNECT);
+       CHECK_VALUE(OST_DISCONNECT);
+       CHECK_VALUE(OST_PUNCH);
+       CHECK_VALUE(OST_OPEN);
+       CHECK_VALUE(OST_CLOSE);
+       CHECK_VALUE(OST_STATFS);
+       CHECK_VALUE(OST_SYNC);
+       CHECK_VALUE(OST_SET_INFO);
+       CHECK_VALUE(OST_QUOTACHECK);
+       CHECK_VALUE(OST_QUOTACTL);
+       CHECK_VALUE(OST_QUOTA_ADJUST_QUNIT);
+       CHECK_VALUE(OST_LAST_OPC);
+
+       CHECK_DEFINE_64X(OBD_OBJECT_EOF);
+
+       CHECK_VALUE(OST_MIN_PRECREATE);
+       CHECK_VALUE(OST_MAX_PRECREATE);
+
+       CHECK_DEFINE_64X(OST_LVB_ERR_INIT);
+       CHECK_DEFINE_64X(OST_LVB_ERR_MASK);
+
+       CHECK_VALUE(MDS_FIRST_OPC);
+       CHECK_VALUE(MDS_GETATTR);
+       CHECK_VALUE(MDS_GETATTR_NAME);
+       CHECK_VALUE(MDS_CLOSE);
+       CHECK_VALUE(MDS_REINT);
+       CHECK_VALUE(MDS_READPAGE);
+       CHECK_VALUE(MDS_CONNECT);
+       CHECK_VALUE(MDS_DISCONNECT);
+       CHECK_VALUE(MDS_GETSTATUS);
+       CHECK_VALUE(MDS_STATFS);
+       CHECK_VALUE(MDS_PIN);
+       CHECK_VALUE(MDS_UNPIN);
+       CHECK_VALUE(MDS_SYNC);
+       CHECK_VALUE(MDS_DONE_WRITING);
+       CHECK_VALUE(MDS_SET_INFO);
+       CHECK_VALUE(MDS_QUOTACHECK);
+       CHECK_VALUE(MDS_QUOTACTL);
+       CHECK_VALUE(MDS_GETXATTR);
+       CHECK_VALUE(MDS_SETXATTR);
+       CHECK_VALUE(MDS_WRITEPAGE);
+       CHECK_VALUE(MDS_IS_SUBDIR);
+       CHECK_VALUE(MDS_GET_INFO);
+       CHECK_VALUE(MDS_HSM_STATE_GET);
+       CHECK_VALUE(MDS_HSM_STATE_SET);
+       CHECK_VALUE(MDS_HSM_ACTION);
+       CHECK_VALUE(MDS_HSM_PROGRESS);
+       CHECK_VALUE(MDS_HSM_REQUEST);
+       CHECK_VALUE(MDS_HSM_CT_REGISTER);
+       CHECK_VALUE(MDS_HSM_CT_UNREGISTER);
+       CHECK_VALUE(MDS_LAST_OPC);
+
+       CHECK_VALUE(REINT_SETATTR);
+       CHECK_VALUE(REINT_CREATE);
+       CHECK_VALUE(REINT_LINK);
+       CHECK_VALUE(REINT_UNLINK);
+       CHECK_VALUE(REINT_RENAME);
+       CHECK_VALUE(REINT_OPEN);
+       CHECK_VALUE(REINT_SETXATTR);
+       CHECK_VALUE(REINT_MAX);
+
+       CHECK_VALUE_X(DISP_IT_EXECD);
+       CHECK_VALUE_X(DISP_LOOKUP_EXECD);
+       CHECK_VALUE_X(DISP_LOOKUP_NEG);
+       CHECK_VALUE_X(DISP_LOOKUP_POS);
+       CHECK_VALUE_X(DISP_OPEN_CREATE);
+       CHECK_VALUE_X(DISP_OPEN_OPEN);
+       CHECK_VALUE_X(DISP_ENQ_COMPLETE);
+       CHECK_VALUE_X(DISP_ENQ_OPEN_REF);
+       CHECK_VALUE_X(DISP_ENQ_CREATE_REF);
+       CHECK_VALUE_X(DISP_OPEN_LOCK);
+
+       CHECK_VALUE(MDS_STATUS_CONN);
+       CHECK_VALUE(MDS_STATUS_LOV);
+
+       CHECK_VALUE(LUSTRE_BFLAG_UNCOMMITTED_WRITES);
+
+       CHECK_VALUE_X(MF_SOM_CHANGE);
+       CHECK_VALUE_X(MF_EPOCH_OPEN);
+       CHECK_VALUE_X(MF_EPOCH_CLOSE);
+       CHECK_VALUE_X(MF_MDC_CANCEL_FID1);
+       CHECK_VALUE_X(MF_MDC_CANCEL_FID2);
+       CHECK_VALUE_X(MF_MDC_CANCEL_FID3);
+       CHECK_VALUE_X(MF_MDC_CANCEL_FID4);
+       CHECK_VALUE_X(MF_SOM_AU);
+       CHECK_VALUE_X(MF_GETATTR_LOCK);
+
+       CHECK_VALUE_64X(MDS_ATTR_MODE);
+       CHECK_VALUE_64X(MDS_ATTR_UID);
+       CHECK_VALUE_64X(MDS_ATTR_GID);
+       CHECK_VALUE_64X(MDS_ATTR_SIZE);
+       CHECK_VALUE_64X(MDS_ATTR_ATIME);
+       CHECK_VALUE_64X(MDS_ATTR_MTIME);
+       CHECK_VALUE_64X(MDS_ATTR_CTIME);
+       CHECK_VALUE_64X(MDS_ATTR_ATIME_SET);
+       CHECK_VALUE_64X(MDS_ATTR_MTIME_SET);
+       CHECK_VALUE_64X(MDS_ATTR_FORCE);
+       CHECK_VALUE_64X(MDS_ATTR_ATTR_FLAG);
+       CHECK_VALUE_64X(MDS_ATTR_KILL_SUID);
+       CHECK_VALUE_64X(MDS_ATTR_KILL_SGID);
+       CHECK_VALUE_64X(MDS_ATTR_CTIME_SET);
+       CHECK_VALUE_64X(MDS_ATTR_FROM_OPEN);
+       CHECK_VALUE_64X(MDS_ATTR_BLOCKS);
+
+       CHECK_VALUE(FLD_QUERY);
+       CHECK_VALUE(FLD_FIRST_OPC);
+       CHECK_VALUE(FLD_LAST_OPC);
+
+       CHECK_VALUE(SEQ_QUERY);
+       CHECK_VALUE(SEQ_FIRST_OPC);
+       CHECK_VALUE(SEQ_LAST_OPC);
+
+       CHECK_VALUE(SEQ_ALLOC_SUPER);
+       CHECK_VALUE(SEQ_ALLOC_META);
+
+       CHECK_VALUE(LDLM_ENQUEUE);
+       CHECK_VALUE(LDLM_CONVERT);
+       CHECK_VALUE(LDLM_CANCEL);
+       CHECK_VALUE(LDLM_BL_CALLBACK);
+       CHECK_VALUE(LDLM_CP_CALLBACK);
+       CHECK_VALUE(LDLM_GL_CALLBACK);
+       CHECK_VALUE(LDLM_SET_INFO);
+       CHECK_VALUE(LDLM_LAST_OPC);
+
+       CHECK_VALUE(LCK_MINMODE);
+       CHECK_VALUE(LCK_EX);
+       CHECK_VALUE(LCK_PW);
+       CHECK_VALUE(LCK_PR);
+       CHECK_VALUE(LCK_CW);
+       CHECK_VALUE(LCK_CR);
+       CHECK_VALUE(LCK_NL);
+       CHECK_VALUE(LCK_GROUP);
+       CHECK_VALUE(LCK_COS);
+       CHECK_VALUE(LCK_MAXMODE);
+       CHECK_VALUE(LCK_MODE_NUM);
+
+       CHECK_CVALUE(LDLM_PLAIN);
+       CHECK_CVALUE(LDLM_EXTENT);
+       CHECK_CVALUE(LDLM_FLOCK);
+       CHECK_CVALUE(LDLM_IBITS);
+       CHECK_CVALUE(LDLM_MAX_TYPE);
+
+       CHECK_CVALUE(LUSTRE_RES_ID_SEQ_OFF);
+       CHECK_CVALUE(LUSTRE_RES_ID_VER_OID_OFF);
+       /* CHECK_CVALUE(LUSTRE_RES_ID_WAS_VER_OFF); packed with OID */
        CHECK_CVALUE(LUSTRE_RES_ID_QUOTA_SEQ_OFF);
        CHECK_CVALUE(LUSTRE_RES_ID_QUOTA_VER_OID_OFF);
-        CHECK_CVALUE(LUSTRE_RES_ID_HSH_OFF);
+       CHECK_CVALUE(LUSTRE_RES_ID_HSH_OFF);
 
        CHECK_CVALUE(LQUOTA_TYPE_USR);
        CHECK_CVALUE(LQUOTA_TYPE_GRP);
@@ -2136,126 +2199,130 @@ main(int argc, char **argv)
        CHECK_CVALUE(LQUOTA_RES_MD);
        CHECK_CVALUE(LQUOTA_RES_DT);
 
-        CHECK_VALUE(OBD_PING);
-        CHECK_VALUE(OBD_LOG_CANCEL);
-        CHECK_VALUE(OBD_QC_CALLBACK);
+       CHECK_VALUE(OBD_PING);
+       CHECK_VALUE(OBD_LOG_CANCEL);
+       CHECK_VALUE(OBD_QC_CALLBACK);
        CHECK_VALUE(OBD_IDX_READ);
-        CHECK_VALUE(OBD_LAST_OPC);
-
-        CHECK_VALUE(QUOTA_DQACQ);
-        CHECK_VALUE(QUOTA_DQREL);
-        CHECK_VALUE(QUOTA_LAST_OPC);
-
-        CHECK_VALUE(MGS_CONNECT);
-        CHECK_VALUE(MGS_DISCONNECT);
-        CHECK_VALUE(MGS_EXCEPTION);
-        CHECK_VALUE(MGS_TARGET_REG);
-        CHECK_VALUE(MGS_TARGET_DEL);
-        CHECK_VALUE(MGS_SET_INFO);
-        CHECK_VALUE(MGS_LAST_OPC);
-
-        CHECK_VALUE(SEC_CTX_INIT);
-        CHECK_VALUE(SEC_CTX_INIT_CONT);
-        CHECK_VALUE(SEC_CTX_FINI);
-        CHECK_VALUE(SEC_LAST_OPC);
-
-        COMMENT("Sizes and Offsets");
-        BLANK_LINE();
-        CHECK_STRUCT(obd_uuid);
-        check_lu_seq_range();
-        check_lustre_mdt_attrs();
+       CHECK_VALUE(OBD_LAST_OPC);
+
+       CHECK_VALUE(QUOTA_DQACQ);
+       CHECK_VALUE(QUOTA_DQREL);
+       CHECK_VALUE(QUOTA_LAST_OPC);
+
+       CHECK_VALUE(MGS_CONNECT);
+       CHECK_VALUE(MGS_DISCONNECT);
+       CHECK_VALUE(MGS_EXCEPTION);
+       CHECK_VALUE(MGS_TARGET_REG);
+       CHECK_VALUE(MGS_TARGET_DEL);
+       CHECK_VALUE(MGS_SET_INFO);
+       CHECK_VALUE(MGS_LAST_OPC);
+
+       CHECK_VALUE(SEC_CTX_INIT);
+       CHECK_VALUE(SEC_CTX_INIT_CONT);
+       CHECK_VALUE(SEC_CTX_FINI);
+       CHECK_VALUE(SEC_LAST_OPC);
+
+       COMMENT("Sizes and Offsets");
+       BLANK_LINE();
+       CHECK_STRUCT(obd_uuid);
+       check_lu_seq_range();
+       check_lustre_mdt_attrs();
        check_som_attrs();
        check_hsm_attrs();
-        check_ost_id();
-        check_lu_dirent();
-        check_luda_type();
-        check_lu_dirpage();
-        check_lustre_handle();
-        check_lustre_msg_v2();
-        check_ptlrpc_body();
-        check_obd_connect_data();
-        check_obdo();
-        check_lov_ost_data_v1();
-        check_lov_mds_md_v1();
-        check_lov_mds_md_v3();
-        check_obd_statfs();
-        check_obd_ioobj();
-        check_obd_quotactl();
+       check_ost_id();
+       check_lu_dirent();
+       check_luda_type();
+       check_lu_dirpage();
+       check_lustre_handle();
+       check_lustre_msg_v2();
+       check_ptlrpc_body();
+       check_obd_connect_data();
+       check_obdo();
+       check_lov_ost_data_v1();
+       check_lov_mds_md_v1();
+       check_lov_mds_md_v3();
+       check_obd_statfs();
+       check_obd_ioobj();
+       check_obd_quotactl();
        check_obd_idx_read();
-        check_niobuf_remote();
-        check_ost_body();
-        check_ll_fid();
-        check_mdt_body();
-        check_mdt_ioepoch();
-        check_mdt_remote_perm();
-        check_mdt_rec_setattr();
-        check_mdt_rec_create();
-        check_mdt_rec_link();
-        check_mdt_rec_unlink();
-        check_mdt_rec_rename();
-        check_mdt_rec_setxattr();
-        check_mdt_rec_reint();
-        check_lmv_desc();
-        check_lmv_stripe_md();
-        check_lov_desc();
-        check_ldlm_res_id();
-        check_ldlm_extent();
-        check_ldlm_inodebits();
-        check_ldlm_flock();
-        check_ldlm_intent();
-        check_ldlm_resource_desc();
-        check_ldlm_lock_desc();
-        check_ldlm_request();
-        check_ldlm_reply();
+       check_niobuf_remote();
+       check_ost_body();
+       check_ll_fid();
+       check_mdt_body();
+       check_mdt_ioepoch();
+       check_mdt_remote_perm();
+       check_mdt_rec_setattr();
+       check_mdt_rec_create();
+       check_mdt_rec_link();
+       check_mdt_rec_unlink();
+       check_mdt_rec_rename();
+       check_mdt_rec_setxattr();
+       check_mdt_rec_reint();
+       check_lmv_desc();
+       check_lmv_stripe_md();
+       check_lov_desc();
+       check_ldlm_res_id();
+       check_ldlm_extent();
+       check_ldlm_inodebits();
+       check_ldlm_flock();
+       check_ldlm_intent();
+       check_ldlm_resource_desc();
+       check_ldlm_lock_desc();
+       check_ldlm_request();
+       check_ldlm_reply();
        check_ldlm_ost_lvb_v1();
-        check_ldlm_ost_lvb();
-        check_ldlm_lquota_lvb();
-        check_ldlm_gl_lquota_desc();
-        check_mgs_send_param();
-        check_cfg_marker();
-        check_llog_logid();
-        check_llog_catid();
-        check_llog_rec_hdr();
-        check_llog_rec_tail();
-        check_llog_logid_rec();
-        check_llog_unlink_rec();
+       check_ldlm_ost_lvb();
+       check_ldlm_lquota_lvb();
+       check_ldlm_gl_lquota_desc();
+       check_mgs_send_param();
+       check_cfg_marker();
+       check_llog_logid();
+       check_llog_catid();
+       check_llog_rec_hdr();
+       check_llog_rec_tail();
+       check_llog_logid_rec();
+       check_llog_unlink_rec();
        check_llog_unlink64_rec();
        check_llog_setattr64_rec();
        check_llog_size_change_rec();
        check_changelog_rec();
        check_changelog_rec_ext();
-        check_changelog_setinfo();
-        check_llog_changelog_rec();
-        check_llog_changelog_user_rec();
-        check_llog_gen();
-        check_llog_gen_rec();
-        check_llog_log_hdr();
-        check_llog_cookie();
-        check_llogd_body();
-        check_llogd_conn_body();
-        check_ll_fiemap_info_key();
+       check_changelog_setinfo();
+       check_llog_changelog_rec();
+       check_llog_changelog_user_rec();
+       check_llog_gen();
+       check_llog_gen_rec();
+       check_llog_log_hdr();
+       check_llog_cookie();
+       check_llogd_body();
+       check_llogd_conn_body();
+       check_ll_fiemap_info_key();
        check_quota_body();
-        check_mgs_target_info();
-        check_lustre_capa();
-        check_lustre_capa_key();
-        check_getinfo_fid2path();
-        check_ll_user_fiemap();
-        check_ll_fiemap_extent();
-        printf("#ifdef LIBLUSTRE_POSIX_ACL\n");
+       check_mgs_target_info();
+       check_lustre_capa();
+       check_lustre_capa_key();
+       check_getinfo_fid2path();
+       check_ll_user_fiemap();
+       check_ll_fiemap_extent();
+       printf("#ifdef LIBLUSTRE_POSIX_ACL\n");
 #ifndef LIBLUSTRE_POSIX_ACL
 #error build generator without LIBLUSTRE_POSIX_ACL defined - produce wrong check code.
 #endif
-        check_posix_acl_xattr_entry();
-        check_posix_acl_xattr_header();
-        printf("#endif\n");
-        check_link_ea_header();
-        check_link_ea_entry();
-        check_hsm_user_item();
-        check_hsm_user_request();
-        check_hsm_user_state();
+       check_posix_acl_xattr_entry();
+       check_posix_acl_xattr_header();
+       printf("#endif\n");
+       check_link_ea_header();
+       check_link_ea_entry();
        check_layout_intent();
+       check_hsm_action_item();
+       check_hsm_action_list();
+       check_hsm_progress();
+       check_hsm_copy();
+       check_hsm_progress_kernel();
+       check_hsm_user_item();
+       check_hsm_user_state();
 
-        printf("}\n\n");
+       printf("}\n\n");
 
-        return(0);
+       return 0;
 }
index 8b76073..2cee23c 100644 (file)
@@ -60,692 +60,704 @@ int main()
 }
 void lustre_assert_wire_constants(void)
 {
-        /* Wire protocol assertions generated by 'wirecheck'
-         * (make -C lustre/utils newwiretest)
-         * running on Linux centos6-bis 2.6.32-279.2.1.el6-head #0 SMP Thu Aug 9 23:25:09 CEST 2012 x
-         * with gcc version 4.4.6 20110731 (Red Hat 4.4.6-3) (GCC)  */
+        /* Wire protocol assertions generated by 'wirecheck'
+         * (make -C lustre/utils newwiretest)
+         * running on Linux centos6-bis 2.6.32-279.2.1.el6-head #0 SMP Thu Aug 9 23:25:09 CEST 2012 x
+         * with gcc version 4.4.6 20110731 (Red Hat 4.4.6-3) (GCC)  */
 
 
-        /* Constants... */
-        LASSERTF(PTL_RPC_MSG_REQUEST == 4711, "found %lld\n",
-                 (long long)PTL_RPC_MSG_REQUEST);
-        LASSERTF(PTL_RPC_MSG_ERR == 4712, "found %lld\n",
-                 (long long)PTL_RPC_MSG_ERR);
-        LASSERTF(PTL_RPC_MSG_REPLY == 4713, "found %lld\n",
-                 (long long)PTL_RPC_MSG_REPLY);
-        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",
-                 (long long)OST_GETATTR);
-        LASSERTF(OST_SETATTR == 2, "found %lld\n",
-                 (long long)OST_SETATTR);
-        LASSERTF(OST_READ == 3, "found %lld\n",
-                 (long long)OST_READ);
-        LASSERTF(OST_WRITE == 4, "found %lld\n",
-                 (long long)OST_WRITE);
-        LASSERTF(OST_CREATE == 5, "found %lld\n",
-                 (long long)OST_CREATE);
-        LASSERTF(OST_DESTROY == 6, "found %lld\n",
-                 (long long)OST_DESTROY);
-        LASSERTF(OST_GET_INFO == 7, "found %lld\n",
-                 (long long)OST_GET_INFO);
-        LASSERTF(OST_CONNECT == 8, "found %lld\n",
-                 (long long)OST_CONNECT);
-        LASSERTF(OST_DISCONNECT == 9, "found %lld\n",
-                 (long long)OST_DISCONNECT);
-        LASSERTF(OST_PUNCH == 10, "found %lld\n",
-                 (long long)OST_PUNCH);
-        LASSERTF(OST_OPEN == 11, "found %lld\n",
-                 (long long)OST_OPEN);
-        LASSERTF(OST_CLOSE == 12, "found %lld\n",
-                 (long long)OST_CLOSE);
-        LASSERTF(OST_STATFS == 13, "found %lld\n",
-                 (long long)OST_STATFS);
-        LASSERTF(OST_SYNC == 16, "found %lld\n",
-                 (long long)OST_SYNC);
-        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",
-                 (long long)OST_QUOTACTL);
-        LASSERTF(OST_QUOTA_ADJUST_QUNIT == 20, "found %lld\n",
-                 (long long)OST_QUOTA_ADJUST_QUNIT);
-        LASSERTF(OST_LAST_OPC == 21, "found %lld\n",
-                 (long long)OST_LAST_OPC);
-        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",
-                 (long long)MDS_GETATTR_NAME);
-        LASSERTF(MDS_CLOSE == 35, "found %lld\n",
-                 (long long)MDS_CLOSE);
-        LASSERTF(MDS_REINT == 36, "found %lld\n",
-                 (long long)MDS_REINT);
-        LASSERTF(MDS_READPAGE == 37, "found %lld\n",
-                 (long long)MDS_READPAGE);
-        LASSERTF(MDS_CONNECT == 38, "found %lld\n",
-                 (long long)MDS_CONNECT);
-        LASSERTF(MDS_DISCONNECT == 39, "found %lld\n",
-                 (long long)MDS_DISCONNECT);
-        LASSERTF(MDS_GETSTATUS == 40, "found %lld\n",
-                 (long long)MDS_GETSTATUS);
-        LASSERTF(MDS_STATFS == 41, "found %lld\n",
-                 (long long)MDS_STATFS);
-        LASSERTF(MDS_PIN == 42, "found %lld\n",
-                 (long long)MDS_PIN);
-        LASSERTF(MDS_UNPIN == 43, "found %lld\n",
-                 (long long)MDS_UNPIN);
-        LASSERTF(MDS_SYNC == 44, "found %lld\n",
-                 (long long)MDS_SYNC);
-        LASSERTF(MDS_DONE_WRITING == 45, "found %lld\n",
-                 (long long)MDS_DONE_WRITING);
-        LASSERTF(MDS_SET_INFO == 46, "found %lld\n",
-                 (long long)MDS_SET_INFO);
-        LASSERTF(MDS_QUOTACHECK == 47, "found %lld\n",
-                 (long long)MDS_QUOTACHECK);
-        LASSERTF(MDS_QUOTACTL == 48, "found %lld\n",
-                 (long long)MDS_QUOTACTL);
-        LASSERTF(MDS_GETXATTR == 49, "found %lld\n",
-                 (long long)MDS_GETXATTR);
-        LASSERTF(MDS_SETXATTR == 50, "found %lld\n",
-                 (long long)MDS_SETXATTR);
-        LASSERTF(MDS_WRITEPAGE == 51, "found %lld\n",
-                 (long long)MDS_WRITEPAGE);
-        LASSERTF(MDS_IS_SUBDIR == 52, "found %lld\n",
-                 (long long)MDS_IS_SUBDIR);
-        LASSERTF(MDS_GET_INFO == 53, "found %lld\n",
-                 (long long)MDS_GET_INFO);
-        LASSERTF(MDS_LAST_OPC == 54, "found %lld\n",
-                 (long long)MDS_LAST_OPC);
-        LASSERTF(REINT_SETATTR == 1, "found %lld\n",
-                 (long long)REINT_SETATTR);
-        LASSERTF(REINT_CREATE == 2, "found %lld\n",
-                 (long long)REINT_CREATE);
-        LASSERTF(REINT_LINK == 3, "found %lld\n",
-                 (long long)REINT_LINK);
-        LASSERTF(REINT_UNLINK == 4, "found %lld\n",
-                 (long long)REINT_UNLINK);
-        LASSERTF(REINT_RENAME == 5, "found %lld\n",
-                 (long long)REINT_RENAME);
-        LASSERTF(REINT_OPEN == 6, "found %lld\n",
-                 (long long)REINT_OPEN);
-        LASSERTF(REINT_SETXATTR == 7, "found %lld\n",
-                 (long long)REINT_SETXATTR);
-        LASSERTF(REINT_MAX == 8, "found %lld\n",
-                 (long long)REINT_MAX);
-        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",
-                 (long long)MDS_STATUS_LOV);
-        LASSERTF(LUSTRE_BFLAG_UNCOMMITTED_WRITES == 1, "found %lld\n",
-                 (long long)LUSTRE_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(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",
-                 (long long)LDLM_CONVERT);
-        LASSERTF(LDLM_CANCEL == 103, "found %lld\n",
-                 (long long)LDLM_CANCEL);
-        LASSERTF(LDLM_BL_CALLBACK == 104, "found %lld\n",
-                 (long long)LDLM_BL_CALLBACK);
-        LASSERTF(LDLM_CP_CALLBACK == 105, "found %lld\n",
-                 (long long)LDLM_CP_CALLBACK);
-        LASSERTF(LDLM_GL_CALLBACK == 106, "found %lld\n",
-                 (long long)LDLM_GL_CALLBACK);
-        LASSERTF(LDLM_SET_INFO == 107, "found %lld\n",
-                 (long long)LDLM_SET_INFO);
-        LASSERTF(LDLM_LAST_OPC == 108, "found %lld\n",
-                 (long long)LDLM_LAST_OPC);
-        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",
-                 (long long)LCK_PW);
-        LASSERTF(LCK_PR == 4, "found %lld\n",
-                 (long long)LCK_PR);
-        LASSERTF(LCK_CW == 8, "found %lld\n",
-                 (long long)LCK_CW);
-        LASSERTF(LCK_CR == 16, "found %lld\n",
-                 (long long)LCK_CR);
-        LASSERTF(LCK_NL == 32, "found %lld\n",
-                 (long long)LCK_NL);
-        LASSERTF(LCK_GROUP == 64, "found %lld\n",
-                 (long long)LCK_GROUP);
-        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",
-                 (long long)LCK_MODE_NUM);
-        CLASSERT(LDLM_PLAIN == 10);
-        CLASSERT(LDLM_EXTENT == 11);
-        CLASSERT(LDLM_FLOCK == 12);
-        CLASSERT(LDLM_IBITS == 13);
-        CLASSERT(LDLM_MAX_TYPE == 14);
-        CLASSERT(LUSTRE_RES_ID_SEQ_OFF == 0);
-        CLASSERT(LUSTRE_RES_ID_VER_OID_OFF == 1);
-        CLASSERT(LUSTRE_RES_ID_QUOTA_SEQ_OFF == 2);
-        CLASSERT(LUSTRE_RES_ID_QUOTA_VER_OID_OFF == 3);
-        CLASSERT(LUSTRE_RES_ID_HSH_OFF == 3);
-        CLASSERT(LQUOTA_TYPE_USR == 0);
-        CLASSERT(LQUOTA_TYPE_GRP == 1);
-        CLASSERT(LQUOTA_RES_MD == 1);
-        CLASSERT(LQUOTA_RES_DT == 2);
-        LASSERTF(OBD_PING == 400, "found %lld\n",
-                 (long long)OBD_PING);
-        LASSERTF(OBD_LOG_CANCEL == 401, "found %lld\n",
-                 (long long)OBD_LOG_CANCEL);
-        LASSERTF(OBD_QC_CALLBACK == 402, "found %lld\n",
-                 (long long)OBD_QC_CALLBACK);
-        LASSERTF(OBD_IDX_READ == 403, "found %lld\n",
-                 (long long)OBD_IDX_READ);
-        LASSERTF(OBD_LAST_OPC == 404, "found %lld\n",
-                 (long long)OBD_LAST_OPC);
-        LASSERTF(QUOTA_DQACQ == 601, "found %lld\n",
-                 (long long)QUOTA_DQACQ);
-        LASSERTF(QUOTA_DQREL == 602, "found %lld\n",
-                 (long long)QUOTA_DQREL);
-        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",
-                 (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(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 */
+       /* Constants... */
+       LASSERTF(PTL_RPC_MSG_REQUEST == 4711, "found %lld\n",
+                (long long)PTL_RPC_MSG_REQUEST);
+       LASSERTF(PTL_RPC_MSG_ERR == 4712, "found %lld\n",
+                (long long)PTL_RPC_MSG_ERR);
+       LASSERTF(PTL_RPC_MSG_REPLY == 4713, "found %lld\n",
+                (long long)PTL_RPC_MSG_REPLY);
+       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",
+                (long long)OST_GETATTR);
+       LASSERTF(OST_SETATTR == 2, "found %lld\n",
+                (long long)OST_SETATTR);
+       LASSERTF(OST_READ == 3, "found %lld\n",
+                (long long)OST_READ);
+       LASSERTF(OST_WRITE == 4, "found %lld\n",
+                (long long)OST_WRITE);
+       LASSERTF(OST_CREATE == 5, "found %lld\n",
+                (long long)OST_CREATE);
+       LASSERTF(OST_DESTROY == 6, "found %lld\n",
+                (long long)OST_DESTROY);
+       LASSERTF(OST_GET_INFO == 7, "found %lld\n",
+                (long long)OST_GET_INFO);
+       LASSERTF(OST_CONNECT == 8, "found %lld\n",
+                (long long)OST_CONNECT);
+       LASSERTF(OST_DISCONNECT == 9, "found %lld\n",
+                (long long)OST_DISCONNECT);
+       LASSERTF(OST_PUNCH == 10, "found %lld\n",
+                (long long)OST_PUNCH);
+       LASSERTF(OST_OPEN == 11, "found %lld\n",
+                (long long)OST_OPEN);
+       LASSERTF(OST_CLOSE == 12, "found %lld\n",
+                (long long)OST_CLOSE);
+       LASSERTF(OST_STATFS == 13, "found %lld\n",
+                (long long)OST_STATFS);
+       LASSERTF(OST_SYNC == 16, "found %lld\n",
+                (long long)OST_SYNC);
+       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",
+                (long long)OST_QUOTACTL);
+       LASSERTF(OST_QUOTA_ADJUST_QUNIT == 20, "found %lld\n",
+                (long long)OST_QUOTA_ADJUST_QUNIT);
+       LASSERTF(OST_LAST_OPC == 21, "found %lld\n",
+                (long long)OST_LAST_OPC);
+       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",
+                (long long)MDS_GETATTR_NAME);
+       LASSERTF(MDS_CLOSE == 35, "found %lld\n",
+                (long long)MDS_CLOSE);
+       LASSERTF(MDS_REINT == 36, "found %lld\n",
+                (long long)MDS_REINT);
+       LASSERTF(MDS_READPAGE == 37, "found %lld\n",
+                (long long)MDS_READPAGE);
+       LASSERTF(MDS_CONNECT == 38, "found %lld\n",
+                (long long)MDS_CONNECT);
+       LASSERTF(MDS_DISCONNECT == 39, "found %lld\n",
+                (long long)MDS_DISCONNECT);
+       LASSERTF(MDS_GETSTATUS == 40, "found %lld\n",
+                (long long)MDS_GETSTATUS);
+       LASSERTF(MDS_STATFS == 41, "found %lld\n",
+                (long long)MDS_STATFS);
+       LASSERTF(MDS_PIN == 42, "found %lld\n",
+                (long long)MDS_PIN);
+       LASSERTF(MDS_UNPIN == 43, "found %lld\n",
+                (long long)MDS_UNPIN);
+       LASSERTF(MDS_SYNC == 44, "found %lld\n",
+                (long long)MDS_SYNC);
+       LASSERTF(MDS_DONE_WRITING == 45, "found %lld\n",
+                (long long)MDS_DONE_WRITING);
+       LASSERTF(MDS_SET_INFO == 46, "found %lld\n",
+                (long long)MDS_SET_INFO);
+       LASSERTF(MDS_QUOTACHECK == 47, "found %lld\n",
+                (long long)MDS_QUOTACHECK);
+       LASSERTF(MDS_QUOTACTL == 48, "found %lld\n",
+                (long long)MDS_QUOTACTL);
+       LASSERTF(MDS_GETXATTR == 49, "found %lld\n",
+                (long long)MDS_GETXATTR);
+       LASSERTF(MDS_SETXATTR == 50, "found %lld\n",
+                (long long)MDS_SETXATTR);
+       LASSERTF(MDS_WRITEPAGE == 51, "found %lld\n",
+                (long long)MDS_WRITEPAGE);
+       LASSERTF(MDS_IS_SUBDIR == 52, "found %lld\n",
+                (long long)MDS_IS_SUBDIR);
+       LASSERTF(MDS_GET_INFO == 53, "found %lld\n",
+                (long long)MDS_GET_INFO);
+       LASSERTF(MDS_HSM_STATE_GET == 54, "found %lld\n",
+                (long long)MDS_HSM_STATE_GET);
+       LASSERTF(MDS_HSM_STATE_SET == 55, "found %lld\n",
+                (long long)MDS_HSM_STATE_SET);
+       LASSERTF(MDS_HSM_ACTION == 56, "found %lld\n",
+                (long long)MDS_HSM_ACTION);
+       LASSERTF(MDS_HSM_PROGRESS == 57, "found %lld\n",
+                (long long)MDS_HSM_PROGRESS);
+       LASSERTF(MDS_HSM_REQUEST == 58, "found %lld\n",
+                (long long)MDS_HSM_REQUEST);
+       LASSERTF(MDS_HSM_CT_REGISTER == 59, "found %lld\n",
+                (long long)MDS_HSM_CT_REGISTER);
+       LASSERTF(MDS_HSM_CT_UNREGISTER == 60, "found %lld\n",
+                (long long)MDS_HSM_CT_UNREGISTER);
+       LASSERTF(MDS_LAST_OPC == 61, "found %lld\n",
+                (long long)MDS_LAST_OPC);
+       LASSERTF(REINT_SETATTR == 1, "found %lld\n",
+                (long long)REINT_SETATTR);
+       LASSERTF(REINT_CREATE == 2, "found %lld\n",
+                (long long)REINT_CREATE);
+       LASSERTF(REINT_LINK == 3, "found %lld\n",
+                (long long)REINT_LINK);
+       LASSERTF(REINT_UNLINK == 4, "found %lld\n",
+                (long long)REINT_UNLINK);
+       LASSERTF(REINT_RENAME == 5, "found %lld\n",
+                (long long)REINT_RENAME);
+       LASSERTF(REINT_OPEN == 6, "found %lld\n",
+                (long long)REINT_OPEN);
+       LASSERTF(REINT_SETXATTR == 7, "found %lld\n",
+                (long long)REINT_SETXATTR);
+       LASSERTF(REINT_MAX == 8, "found %lld\n",
+                (long long)REINT_MAX);
+       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",
+                (long long)MDS_STATUS_LOV);
+       LASSERTF(LUSTRE_BFLAG_UNCOMMITTED_WRITES == 1, "found %lld\n",
+                (long long)LUSTRE_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(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",
+                (long long)LDLM_CONVERT);
+       LASSERTF(LDLM_CANCEL == 103, "found %lld\n",
+                (long long)LDLM_CANCEL);
+       LASSERTF(LDLM_BL_CALLBACK == 104, "found %lld\n",
+                (long long)LDLM_BL_CALLBACK);
+       LASSERTF(LDLM_CP_CALLBACK == 105, "found %lld\n",
+                (long long)LDLM_CP_CALLBACK);
+       LASSERTF(LDLM_GL_CALLBACK == 106, "found %lld\n",
+                (long long)LDLM_GL_CALLBACK);
+       LASSERTF(LDLM_SET_INFO == 107, "found %lld\n",
+                (long long)LDLM_SET_INFO);
+       LASSERTF(LDLM_LAST_OPC == 108, "found %lld\n",
+                (long long)LDLM_LAST_OPC);
+       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",
+                (long long)LCK_PW);
+       LASSERTF(LCK_PR == 4, "found %lld\n",
+                (long long)LCK_PR);
+       LASSERTF(LCK_CW == 8, "found %lld\n",
+                (long long)LCK_CW);
+       LASSERTF(LCK_CR == 16, "found %lld\n",
+                (long long)LCK_CR);
+       LASSERTF(LCK_NL == 32, "found %lld\n",
+                (long long)LCK_NL);
+       LASSERTF(LCK_GROUP == 64, "found %lld\n",
+                (long long)LCK_GROUP);
+       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",
+                (long long)LCK_MODE_NUM);
+       CLASSERT(LDLM_PLAIN == 10);
+       CLASSERT(LDLM_EXTENT == 11);
+       CLASSERT(LDLM_FLOCK == 12);
+       CLASSERT(LDLM_IBITS == 13);
+       CLASSERT(LDLM_MAX_TYPE == 14);
+       CLASSERT(LUSTRE_RES_ID_SEQ_OFF == 0);
+       CLASSERT(LUSTRE_RES_ID_VER_OID_OFF == 1);
+       CLASSERT(LUSTRE_RES_ID_QUOTA_SEQ_OFF == 2);
+       CLASSERT(LUSTRE_RES_ID_QUOTA_VER_OID_OFF == 3);
+       CLASSERT(LUSTRE_RES_ID_HSH_OFF == 3);
+       CLASSERT(LQUOTA_TYPE_USR == 0);
+       CLASSERT(LQUOTA_TYPE_GRP == 1);
+       CLASSERT(LQUOTA_RES_MD == 1);
+       CLASSERT(LQUOTA_RES_DT == 2);
+       LASSERTF(OBD_PING == 400, "found %lld\n",
+                (long long)OBD_PING);
+       LASSERTF(OBD_LOG_CANCEL == 401, "found %lld\n",
+                (long long)OBD_LOG_CANCEL);
+       LASSERTF(OBD_QC_CALLBACK == 402, "found %lld\n",
+                (long long)OBD_QC_CALLBACK);
+       LASSERTF(OBD_IDX_READ == 403, "found %lld\n",
+                (long long)OBD_IDX_READ);
+       LASSERTF(OBD_LAST_OPC == 404, "found %lld\n",
+                (long long)OBD_LAST_OPC);
+       LASSERTF(QUOTA_DQACQ == 601, "found %lld\n",
+                (long long)QUOTA_DQACQ);
+       LASSERTF(QUOTA_DQREL == 602, "found %lld\n",
+                (long long)QUOTA_DQREL);
+       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",
+                (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(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",
-                 (long long)(int)sizeof(struct obd_uuid));
+       /* Checks for struct obd_uuid */
+       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 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) == 32, "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(LMA_INCOMPAT_SUPP == 0x0, "found %lld\n",
-                 (long long)LMA_INCOMPAT_SUPP);
-        LASSERTF(LMAI_RELEASED == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)LMAI_RELEASED);
-        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 lustre_mdt_attrs */
+       LASSERTF((int)sizeof(struct lustre_mdt_attrs) == 32, "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(LMAI_RELEASED == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)LMAI_RELEASED);
+       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 som_attrs */
-        LASSERTF((int)sizeof(struct som_attrs) == 40, "found %lld\n",
-                 (long long)(int)sizeof(struct som_attrs));
-        LASSERTF((int)offsetof(struct som_attrs, som_compat) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_compat));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_compat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_compat));
-        LASSERTF((int)offsetof(struct som_attrs, som_incompat) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_incompat));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_incompat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_incompat));
-        LASSERTF((int)offsetof(struct som_attrs, som_ioepoch) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_ioepoch));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_ioepoch) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_ioepoch));
-        LASSERTF((int)offsetof(struct som_attrs, som_size) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_size));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_size) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_size));
-        LASSERTF((int)offsetof(struct som_attrs, som_blocks) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_blocks));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_blocks) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_blocks));
-        LASSERTF((int)offsetof(struct som_attrs, som_mountid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct som_attrs, som_mountid));
-        LASSERTF((int)sizeof(((struct som_attrs *)0)->som_mountid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct som_attrs *)0)->som_mountid));
+       /* Checks for struct som_attrs */
+       LASSERTF((int)sizeof(struct som_attrs) == 40, "found %lld\n",
+                (long long)(int)sizeof(struct som_attrs));
+       LASSERTF((int)offsetof(struct som_attrs, som_compat) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_compat));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_compat) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_compat));
+       LASSERTF((int)offsetof(struct som_attrs, som_incompat) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_incompat));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_incompat) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_incompat));
+       LASSERTF((int)offsetof(struct som_attrs, som_ioepoch) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_ioepoch));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_ioepoch) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_ioepoch));
+       LASSERTF((int)offsetof(struct som_attrs, som_size) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_size));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_size) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_size));
+       LASSERTF((int)offsetof(struct som_attrs, som_blocks) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_blocks));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_blocks) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_blocks));
+       LASSERTF((int)offsetof(struct som_attrs, som_mountid) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct som_attrs, som_mountid));
+       LASSERTF((int)sizeof(((struct som_attrs *)0)->som_mountid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct som_attrs *)0)->som_mountid));
 
-        /* Checks for struct hsm_attrs */
-        LASSERTF((int)sizeof(struct hsm_attrs) == 24, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_attrs));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_compat) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_compat));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_compat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_compat));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_flags));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_flags));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_id) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_arch_id));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id));
-        LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_ver) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_attrs, hsm_arch_ver));
-        LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver));
+       /* Checks for struct hsm_attrs */
+       LASSERTF((int)sizeof(struct hsm_attrs) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_attrs));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_compat) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_compat));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_compat) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_compat));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_flags));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_flags));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_id) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_arch_id));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id));
+       LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_ver) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_attrs, hsm_arch_ver));
+       LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver));
 
-        /* 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_SPECIAL == 0x0000000200000004ULL, "found 0x%.16llxULL\n",
-                 (long long)FID_SEQ_SPECIAL);
-        LASSERTF(FID_SEQ_QUOTA == 0x0000000200000005ULL, "found 0x%.16llxULL\n",
-                 (long long)FID_SEQ_QUOTA);
-        LASSERTF(FID_SEQ_QUOTA_GLB == 0x0000000200000006ULL, "found 0x%.16llxULL\n",
-                 (long long)FID_SEQ_QUOTA_GLB);
-        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);
-        LASSERTF(FID_OID_SPECIAL_BFL == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_SPECIAL_BFL);
-        LASSERTF(FID_OID_DOT_LUSTRE == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_DOT_LUSTRE);
-        LASSERTF(FID_OID_DOT_LUSTRE_OBF == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_DOT_LUSTRE_OBF);
+       /* 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_SPECIAL == 0x0000000200000004ULL, "found 0x%.16llxULL\n",
+                       (long long)FID_SEQ_SPECIAL);
+       LASSERTF(FID_SEQ_QUOTA == 0x0000000200000005ULL, "found 0x%.16llxULL\n",
+                       (long long)FID_SEQ_QUOTA);
+       LASSERTF(FID_SEQ_QUOTA_GLB == 0x0000000200000006ULL, "found 0x%.16llxULL\n",
+                       (long long)FID_SEQ_QUOTA_GLB);
+       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);
+       LASSERTF(FID_OID_SPECIAL_BFL == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)FID_OID_SPECIAL_BFL);
+       LASSERTF(FID_OID_DOT_LUSTRE == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)FID_OID_DOT_LUSTRE);
+       LASSERTF(FID_OID_DOT_LUSTRE_OBF == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)FID_OID_DOT_LUSTRE_OBF);
 
-        /* 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 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 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 union lu_page */
-        LASSERTF((int)sizeof(union lu_page) == 4096, "found %lld\n",
-                 (long long)(int)sizeof(union lu_page));
+       /* 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 union lu_page */
+       LASSERTF((int)sizeof(union lu_page) == 4096, "found %lld\n",
+                (long long)(int)sizeof(union lu_page));
 
-        /* Checks for struct lustre_handle */
-        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",
-                 (long long)(int)offsetof(struct lustre_handle, cookie));
-        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_handle */
+       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",
+                (long long)(int)offsetof(struct lustre_handle, cookie));
+       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",
-                 (long long)(int)sizeof(struct lustre_msg_v2));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_bufcount));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_secflvr));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_magic));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_repsize));
-        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",
-                 (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_cksum));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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 lustre_msg_v2 */
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_bufcount));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_secflvr));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_magic));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_repsize));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_cksum));
+       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",
+                (long long)(int)offsetof(struct lustre_msg_v2, lm_flags));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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_v3) == 184, "found %lld\n",
-                 (long long)(int)sizeof(struct ptlrpc_body_v3));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_handle) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_handle));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_type) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_type));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_version) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_version));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_opc) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_opc));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_status) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_status));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_xid) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_xid));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_seen) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_seen));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_committed) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_committed));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_transno) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_transno));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_flags) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_flags));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_op_flags) == 60, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_op_flags));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_timeout) == 68, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_timeout));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_service_time) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_service_time));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_limit) == 76, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_limit));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_slv) == 80, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_slv));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv));
-        CLASSERT(PTLRPC_NUM_VERSIONS == 4);
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_pre_versions) == 88, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_pre_versions));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding));
-        CLASSERT(JOBSTATS_JOBID_SIZE == 32);
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_jobid) == 152, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_jobid));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid));
+       /* Checks for struct ptlrpc_body */
+       LASSERTF((int)sizeof(struct ptlrpc_body_v3) == 184, "found %lld\n",
+                (long long)(int)sizeof(struct ptlrpc_body_v3));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_handle) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_handle));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_type) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_type));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_version) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_version));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_opc) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_opc));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_status) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_status));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_xid) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_xid));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_seen) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_seen));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_committed) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_committed));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_transno) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_transno));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_flags) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_flags));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_op_flags) == 60, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_op_flags));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_timeout) == 68, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_timeout));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_service_time) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_service_time));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_limit) == 76, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_limit));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_slv) == 80, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_slv));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv));
+       CLASSERT(PTLRPC_NUM_VERSIONS == 4);
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_pre_versions) == 88, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_pre_versions));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == 32, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == 32, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding));
+       CLASSERT(JOBSTATS_JOBID_SIZE == 32);
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_jobid) == 152, "found %lld\n",
+                (long long)(int)offsetof(struct ptlrpc_body_v3, pb_jobid));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid) == 32, "found %lld\n",
+                (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid));
        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_handle) == (int)offsetof(struct ptlrpc_body_v2, pb_handle), "%d != %d\n",
                 (int)offsetof(struct ptlrpc_body_v3, pb_handle), (int)offsetof(struct ptlrpc_body_v2, pb_handle));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_handle), "%d != %d\n",
@@ -818,3392 +830,3529 @@ void lustre_assert_wire_constants(void)
                 (int)offsetof(struct ptlrpc_body_v3, pb_padding), (int)offsetof(struct ptlrpc_body_v2, pb_padding));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding), "%d != %d\n",
                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding));
-        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);
+       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",
-                 (long long)(int)sizeof(struct obd_connect_data));
-        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",
-                 (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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_version));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_grant));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_index));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_blocksize) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_blocksize));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_inodespace) == 33, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_inodespace));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_grant_extent) == 34, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_grant_extent));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_unused) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_unused));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_unused) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_unused));
-        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",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_transno));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_instance));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, padding1));
-        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",
-                 (long long)(int)offsetof(struct obd_connect_data, padding2));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding3) == 88, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding3));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding3));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding4) == 96, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding4));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding4) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding4));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding5) == 104, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding5));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding5) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding5));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding6) == 112, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding6));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding6) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding6));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding7) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding7));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding7) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding7));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding8) == 128, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding8));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding8) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding8));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding9) == 136, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding9));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding9) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding9));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingA) == 144, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingA));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingA) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingA));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingB) == 152, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingB));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingB) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingB));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingC) == 160, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingC));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingC) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingC));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingD) == 168, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingD));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingD) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingD));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingE) == 176, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingE));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingE) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingE));
-        LASSERTF((int)offsetof(struct obd_connect_data, paddingF) == 184, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, paddingF));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingF) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingF));
-        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_CONNECT_JOBSTATS == 0x20000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_JOBSTATS);
-        LASSERTF(OBD_CONNECT_UMASK == 0x40000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_UMASK);
-        LASSERTF(OBD_CONNECT_EINPROGRESS == 0x80000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_EINPROGRESS);
-        LASSERTF(OBD_CONNECT_GRANT_PARAM == 0x100000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_GRANT_PARAM);
-        LASSERTF(OBD_CONNECT_FLOCK_OWNER == 0x200000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_FLOCK_OWNER);
-        LASSERTF(OBD_CONNECT_LVB_TYPE == 0x400000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_LVB_TYPE);
-        LASSERTF(OBD_CONNECT_NANOSEC_TIME == 0x800000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_NANOSEC_TIME);
-        LASSERTF(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_LIGHTWEIGHT);
-        LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n",
-                 OBD_CONNECT_SHORTIO);
-        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 obd_connect_data */
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_version));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_grant));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_index));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_blocksize) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_blocksize));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_blocksize));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_inodespace) == 33, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_inodespace));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_inodespace));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_grant_extent) == 34, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_grant_extent));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_grant_extent));
+       LASSERTF((int)offsetof(struct obd_connect_data, ocd_unused) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_unused));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_unused) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_unused));
+       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",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_transno));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_instance));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, padding1));
+       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",
+                (long long)(int)offsetof(struct obd_connect_data, padding2));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding3) == 88, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding3));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding3));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding4) == 96, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding4));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding4) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding4));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding5) == 104, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding5));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding5) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding5));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding6) == 112, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding6));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding6) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding6));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding7) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding7));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding7) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding7));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding8) == 128, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding8));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding8) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding8));
+       LASSERTF((int)offsetof(struct obd_connect_data, padding9) == 136, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, padding9));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding9) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->padding9));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingA) == 144, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingA));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingA) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingA));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingB) == 152, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingB));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingB) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingB));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingC) == 160, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingC));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingC) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingC));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingD) == 168, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingD));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingD) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingD));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingE) == 176, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingE));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingE) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingE));
+       LASSERTF((int)offsetof(struct obd_connect_data, paddingF) == 184, "found %lld\n",
+                (long long)(int)offsetof(struct obd_connect_data, paddingF));
+       LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingF) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingF));
+       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_CONNECT_JOBSTATS == 0x20000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_JOBSTATS);
+       LASSERTF(OBD_CONNECT_UMASK == 0x40000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_UMASK);
+       LASSERTF(OBD_CONNECT_EINPROGRESS == 0x80000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_EINPROGRESS);
+       LASSERTF(OBD_CONNECT_GRANT_PARAM == 0x100000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_GRANT_PARAM);
+       LASSERTF(OBD_CONNECT_FLOCK_OWNER == 0x200000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_FLOCK_OWNER);
+       LASSERTF(OBD_CONNECT_LVB_TYPE == 0x400000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_LVB_TYPE);
+       LASSERTF(OBD_CONNECT_NANOSEC_TIME == 0x800000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_NANOSEC_TIME);
+       LASSERTF(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_LIGHTWEIGHT);
+       LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_SHORTIO);
+       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",
-                 (long long)(int)sizeof(struct obdo));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_valid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_id));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_seq));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_parent_seq));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_size));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_mtime));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_atime));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_ctime));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_blocks));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_grant));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_blksize));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_mode));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_uid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_gid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_flags));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_nlink));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_parent_oid));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_misc));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_ioepoch));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_stripe_idx));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_parent_ver));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_handle));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_lcookie));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_uid_h));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_gid_h));
-        LASSERTF((int)offsetof(struct obdo, o_data_version) == 176, "found %lld\n",
-                 (long long)(int)offsetof(struct obdo, o_data_version));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_data_version) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_data_version));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_padding_4));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_padding_5));
-        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",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_padding_6));
-        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_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);
-        LASSERTF(OBD_MD_FLDATAVERSION == (0x0010000000000000ULL), "found 0x%.16llxULL\n",
-                 OBD_MD_FLDATAVERSION);
-        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 obdo */
+       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",
+                (long long)(int)offsetof(struct obdo, o_valid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_oi.oi_id));
+       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",
+                (long long)(int)offsetof(struct obdo, o_oi.oi_seq));
+       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",
+                (long long)(int)offsetof(struct obdo, o_parent_seq));
+       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",
+                (long long)(int)offsetof(struct obdo, o_size));
+       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",
+                (long long)(int)offsetof(struct obdo, o_mtime));
+       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",
+                (long long)(int)offsetof(struct obdo, o_atime));
+       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",
+                (long long)(int)offsetof(struct obdo, o_ctime));
+       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",
+                (long long)(int)offsetof(struct obdo, o_blocks));
+       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",
+                (long long)(int)offsetof(struct obdo, o_grant));
+       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",
+                (long long)(int)offsetof(struct obdo, o_blksize));
+       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",
+                (long long)(int)offsetof(struct obdo, o_mode));
+       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",
+                (long long)(int)offsetof(struct obdo, o_uid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_gid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_flags));
+       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",
+                (long long)(int)offsetof(struct obdo, o_nlink));
+       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",
+                (long long)(int)offsetof(struct obdo, o_parent_oid));
+       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",
+                (long long)(int)offsetof(struct obdo, o_misc));
+       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",
+                (long long)(int)offsetof(struct obdo, o_ioepoch));
+       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",
+                (long long)(int)offsetof(struct obdo, o_stripe_idx));
+       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",
+                (long long)(int)offsetof(struct obdo, o_parent_ver));
+       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",
+                (long long)(int)offsetof(struct obdo, o_handle));
+       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",
+                (long long)(int)offsetof(struct obdo, o_lcookie));
+       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",
+                (long long)(int)offsetof(struct obdo, o_uid_h));
+       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",
+                (long long)(int)offsetof(struct obdo, o_gid_h));
+       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_data_version) == 176, "found %lld\n",
+                (long long)(int)offsetof(struct obdo, o_data_version));
+       LASSERTF((int)sizeof(((struct obdo *)0)->o_data_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obdo *)0)->o_data_version));
+       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",
+                (long long)(int)sizeof(((struct obdo *)0)->o_padding_4));
+       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",
+                (long long)(int)sizeof(((struct obdo *)0)->o_padding_5));
+       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",
+                (long long)(int)sizeof(((struct obdo *)0)->o_padding_6));
+       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_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);
+       LASSERTF(OBD_MD_FLDATAVERSION == (0x0010000000000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLDATAVERSION);
+       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_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",
-                 (long long)(int)sizeof(struct lov_mds_md_v1));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct lov_mds_md_v1, lmm_stripe_count));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
-                 (long long)(int)offsetof(struct lov_mds_md_v1, lmm_layout_gen));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen));
-        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);
+       /* Checks for struct lov_mds_md_v1 */
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct lov_mds_md_v1, lmm_stripe_count));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
+                (long long)(int)offsetof(struct lov_mds_md_v1, lmm_layout_gen));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_layout_gen));
+       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);
 
-        /* Checks for struct lov_mds_md_v3 */
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_stripe_count));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
-                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_layout_gen));
-        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen));
-        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 == 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 lov_mds_md_v3 */
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct lov_mds_md_v3, lmm_stripe_count));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_stripe_count) == 2, "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_layout_gen) == 30, "found %lld\n",
+                (long long)(int)offsetof(struct lov_mds_md_v3, lmm_layout_gen));
+       LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen));
+       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 == 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",
-                 (long long)(int)sizeof(struct obd_statfs));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_type));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_blocks));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_bfree));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_bavail));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_ffree));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_fsid));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_bsize));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_namelen));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_state));
-        LASSERTF((int)offsetof(struct obd_statfs, os_fprecreated) == 108, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_statfs, os_fprecreated));
-        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_fprecreated) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_fprecreated));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare2));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare3));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare4));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare5));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare6));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare7));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare8));
-        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",
-                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare9));
+       /* Checks for struct obd_statfs */
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_type));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_blocks));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_bfree));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_bavail));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_ffree));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_fsid));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_bsize));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_namelen));
+       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",
+                (long long)(int)offsetof(struct obd_statfs, os_state));
+       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_fprecreated) == 108, "found %lld\n",
+                (long long)(int)offsetof(struct obd_statfs, os_fprecreated));
+       LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_fprecreated) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_fprecreated));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare2));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare3));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare4));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare5));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare6));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare7));
+       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",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare8));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct obd_ioobj));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_id));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_seq));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_type));
-        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",
-                 (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt));
+       /* Checks for struct obd_ioobj */
+       LASSERTF((int)sizeof(struct obd_ioobj) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct obd_ioobj));
+       LASSERTF((int)offsetof(struct obd_ioobj, ioo_oid.oi_id) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct obd_ioobj, ioo_oid.oi_id));
+       LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_id) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_id));
+       LASSERTF((int)offsetof(struct obd_ioobj, ioo_oid.oi_seq) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct obd_ioobj, ioo_oid.oi_seq));
+       LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_seq) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_oid.oi_seq));
+       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",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_type));
+       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",
+                (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt));
 
-        /* Checks for union lquota_id */
-        LASSERTF((int)sizeof(union lquota_id) == 16, "found %lld\n",
-                 (long long)(int)sizeof(union lquota_id));
+       /* Checks for union lquota_id */
+       LASSERTF((int)sizeof(union lquota_id) == 16, "found %lld\n",
+                (long long)(int)sizeof(union lquota_id));
 
-        LASSERTF(QUOTABLOCK_BITS == 10, "found %lld\n",
-                 (long long)QUOTABLOCK_BITS);
-        LASSERTF(QUOTABLOCK_SIZE == 1024, "found %lld\n",
-                 (long long)QUOTABLOCK_SIZE);
+       LASSERTF(QUOTABLOCK_BITS == 10, "found %lld\n",
+                (long long)QUOTABLOCK_BITS);
+       LASSERTF(QUOTABLOCK_SIZE == 1024, "found %lld\n",
+                (long long)QUOTABLOCK_SIZE);
 
-        /* Checks for struct obd_quotactl */
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_cmd));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_type));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_id));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_stat));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_dqinfo));
-        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",
-                 (long long)(int)offsetof(struct obd_quotactl, qc_dqblk));
-        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_quotactl */
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_cmd));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_type));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_id));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_stat));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_dqinfo));
+       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",
+                (long long)(int)offsetof(struct obd_quotactl, qc_dqblk));
+       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",
-                 (long long)(int)sizeof(struct obd_dqinfo));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_bgrace));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_igrace));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_flags));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_valid));
+       /* Checks for struct obd_dqinfo */
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_bgrace));
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_igrace));
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_flags));
+       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",
+                (long long)(int)offsetof(struct obd_dqinfo, dqi_valid));
+       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",
-                 (long long)(int)sizeof(struct obd_dqblk));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bhardlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bsoftlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curspace));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_ihardlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_isoftlimit));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curinodes));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_btime));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_itime));
-        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",
-                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_valid));
-        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 obd_dqblk */
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_bhardlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_bsoftlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_curspace));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_ihardlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_isoftlimit));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_curinodes));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_btime));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_itime));
+       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",
+                (long long)(int)offsetof(struct obd_dqblk, dqb_valid));
+       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, 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 lquota_acct_rec */
-        LASSERTF((int)sizeof(struct lquota_acct_rec) == 16, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_acct_rec));
-        LASSERTF((int)offsetof(struct lquota_acct_rec, bspace) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_acct_rec, bspace));
-        LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->bspace) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_acct_rec *)0)->bspace));
-        LASSERTF((int)offsetof(struct lquota_acct_rec, ispace) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_acct_rec, ispace));
-        LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->ispace) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_acct_rec *)0)->ispace));
+       /* Checks for struct lquota_acct_rec */
+       LASSERTF((int)sizeof(struct lquota_acct_rec) == 16, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_acct_rec));
+       LASSERTF((int)offsetof(struct lquota_acct_rec, bspace) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_acct_rec, bspace));
+       LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->bspace) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_acct_rec *)0)->bspace));
+       LASSERTF((int)offsetof(struct lquota_acct_rec, ispace) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_acct_rec, ispace));
+       LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->ispace) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_acct_rec *)0)->ispace));
 
-        /* Checks for struct lquota_glb_rec */
-        LASSERTF((int)sizeof(struct lquota_glb_rec) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_glb_rec));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_hardlimit) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_hardlimit));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_softlimit) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_softlimit));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_time) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_time));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_time) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_time));
-        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_granted) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_granted));
-        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted));
+       /* Checks for struct lquota_glb_rec */
+       LASSERTF((int)sizeof(struct lquota_glb_rec) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_glb_rec));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_hardlimit) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_hardlimit));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_softlimit) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_softlimit));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_time) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_time));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_time) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_time));
+       LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_granted) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_glb_rec, qbr_granted));
+       LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted));
 
-        /* Checks for struct lquota_slv_rec */
-        LASSERTF((int)sizeof(struct lquota_slv_rec) == 8, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_slv_rec));
-        LASSERTF((int)offsetof(struct lquota_slv_rec, qsr_granted) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_slv_rec, qsr_granted));
-        LASSERTF((int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted));
+       /* Checks for struct lquota_slv_rec */
+       LASSERTF((int)sizeof(struct lquota_slv_rec) == 8, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_slv_rec));
+       LASSERTF((int)offsetof(struct lquota_slv_rec, qsr_granted) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_slv_rec, qsr_granted));
+       LASSERTF((int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted));
 
-        /* Checks for struct idx_info */
-        LASSERTF((int)sizeof(struct idx_info) == 80, "found %lld\n",
-                 (long long)(int)sizeof(struct idx_info));
-        LASSERTF((int)offsetof(struct idx_info, ii_magic) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_magic));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_magic) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_magic));
-        LASSERTF((int)offsetof(struct idx_info, ii_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_flags));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_flags));
-        LASSERTF((int)offsetof(struct idx_info, ii_count) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_count));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_count) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_count));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad0) == 10, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad0));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad0) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad0));
-        LASSERTF((int)offsetof(struct idx_info, ii_attrs) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_attrs));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_attrs) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_attrs));
-        LASSERTF((int)offsetof(struct idx_info, ii_fid) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_fid));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_fid));
-        LASSERTF((int)offsetof(struct idx_info, ii_version) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_version));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_version) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_version));
-        LASSERTF((int)offsetof(struct idx_info, ii_hash_start) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_hash_start));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_start) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_start));
-        LASSERTF((int)offsetof(struct idx_info, ii_hash_end) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_hash_end));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_end) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_end));
-        LASSERTF((int)offsetof(struct idx_info, ii_keysize) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_keysize));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_keysize) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_keysize));
-        LASSERTF((int)offsetof(struct idx_info, ii_recsize) == 58, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_recsize));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_recsize) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_recsize));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad1) == 60, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad1));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad1));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad2) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad2));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad2));
-        LASSERTF((int)offsetof(struct idx_info, ii_pad3) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct idx_info, ii_pad3));
-        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad3));
-        CLASSERT(IDX_INFO_MAGIC == 0x3D37CC37);
+       /* Checks for struct idx_info */
+       LASSERTF((int)sizeof(struct idx_info) == 80, "found %lld\n",
+                (long long)(int)sizeof(struct idx_info));
+       LASSERTF((int)offsetof(struct idx_info, ii_magic) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_magic));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_magic) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_magic));
+       LASSERTF((int)offsetof(struct idx_info, ii_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_flags));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_flags));
+       LASSERTF((int)offsetof(struct idx_info, ii_count) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_count));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_count) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_count));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad0) == 10, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad0));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad0) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad0));
+       LASSERTF((int)offsetof(struct idx_info, ii_attrs) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_attrs));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_attrs) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_attrs));
+       LASSERTF((int)offsetof(struct idx_info, ii_fid) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_fid));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_fid));
+       LASSERTF((int)offsetof(struct idx_info, ii_version) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_version));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_version));
+       LASSERTF((int)offsetof(struct idx_info, ii_hash_start) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_hash_start));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_start) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_start));
+       LASSERTF((int)offsetof(struct idx_info, ii_hash_end) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_hash_end));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_end) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_end));
+       LASSERTF((int)offsetof(struct idx_info, ii_keysize) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_keysize));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_keysize) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_keysize));
+       LASSERTF((int)offsetof(struct idx_info, ii_recsize) == 58, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_recsize));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_recsize) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_recsize));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad1) == 60, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad1));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad1));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad2) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad2));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad2));
+       LASSERTF((int)offsetof(struct idx_info, ii_pad3) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct idx_info, ii_pad3));
+       LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct idx_info *)0)->ii_pad3));
+       CLASSERT(IDX_INFO_MAGIC == 0x3D37CC37);
 
-        /* Checks for struct lu_idxpage */
-        LASSERTF((int)sizeof(struct lu_idxpage) == 16, "found %lld\n",
-                 (long long)(int)sizeof(struct lu_idxpage));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_magic) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_magic));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_magic) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_magic));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_flags));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_flags) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_flags));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_nr) == 6, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_nr));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_nr) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_nr));
-        LASSERTF((int)offsetof(struct lu_idxpage, lip_pad0) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lu_idxpage, lip_pad0));
-        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_pad0) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_pad0));
-        CLASSERT(LIP_MAGIC == 0x8A6D6B6C);
-        LASSERTF(LIP_HDR_SIZE == 16, "found %lld\n",
-                 (long long)LIP_HDR_SIZE);
-        LASSERTF(II_FL_NOHASH == 1, "found %lld\n",
-                 (long long)II_FL_NOHASH);
-        LASSERTF(II_FL_VARKEY == 2, "found %lld\n",
-                 (long long)II_FL_VARKEY);
-        LASSERTF(II_FL_VARREC == 4, "found %lld\n",
-                 (long long)II_FL_VARREC);
-        LASSERTF(II_FL_NONUNQ == 8, "found %lld\n",
-                 (long long)II_FL_NONUNQ);
+       /* Checks for struct lu_idxpage */
+       LASSERTF((int)sizeof(struct lu_idxpage) == 16, "found %lld\n",
+                (long long)(int)sizeof(struct lu_idxpage));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_magic) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_magic));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_magic) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_magic));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_flags));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_flags));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_nr) == 6, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_nr));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_nr) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_nr));
+       LASSERTF((int)offsetof(struct lu_idxpage, lip_pad0) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lu_idxpage, lip_pad0));
+       LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_pad0) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_pad0));
+       CLASSERT(LIP_MAGIC == 0x8A6D6B6C);
+       LASSERTF(LIP_HDR_SIZE == 16, "found %lld\n",
+                (long long)LIP_HDR_SIZE);
+       LASSERTF(II_FL_NOHASH == 1, "found %lld\n",
+                (long long)II_FL_NOHASH);
+       LASSERTF(II_FL_VARKEY == 2, "found %lld\n",
+                (long long)II_FL_VARKEY);
+       LASSERTF(II_FL_VARREC == 4, "found %lld\n",
+                (long long)II_FL_VARREC);
+       LASSERTF(II_FL_NONUNQ == 8, "found %lld\n",
+                (long long)II_FL_NONUNQ);
 
-        /* Checks for struct niobuf_remote */
-        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",
-                 (long long)(int)offsetof(struct niobuf_remote, offset));
-        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",
-                 (long long)(int)offsetof(struct niobuf_remote, len));
-        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",
-                 (long long)(int)offsetof(struct niobuf_remote, flags));
-        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 == 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 niobuf_remote */
+       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",
+                (long long)(int)offsetof(struct niobuf_remote, offset));
+       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",
+                (long long)(int)offsetof(struct niobuf_remote, len));
+       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",
+                (long long)(int)offsetof(struct niobuf_remote, flags));
+       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 == 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",
-                 (long long)(int)sizeof(struct ost_body));
-        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",
-                 (long long)(int)sizeof(((struct ost_body *)0)->oa));
+       /* Checks for struct ost_body */
+       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",
+                (long long)(int)offsetof(struct ost_body, oa));
+       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",
-                 (long long)(int)sizeof(struct ll_fid));
-        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",
-                 (long long)(int)sizeof(((struct ll_fid *)0)->id));
-        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",
-                 (long long)(int)sizeof(((struct ll_fid *)0)->generation));
-        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",
-                 (long long)(int)sizeof(((struct ll_fid *)0)->f_type));
+       /* Checks for struct ll_fid */
+       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",
+                (long long)(int)offsetof(struct ll_fid, id));
+       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",
+                (long long)(int)offsetof(struct ll_fid, generation));
+       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",
+                (long long)(int)offsetof(struct ll_fid, f_type));
+       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 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_BY_FID == 000040000000UL, "found 0%.11oUL\n",
-                 MDS_OPEN_BY_FID);
-        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_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_OPEN_VOLATILE == 00000000000400000000000ULL, "found 0%.22lloULL\n",
-                 (long long)MDS_OPEN_VOLATILE);
-        LASSERTF(LUSTRE_SYNC_FL == 0x00000008, "found 0x%.8x\n",
-                 LUSTRE_SYNC_FL);
-        LASSERTF(LUSTRE_IMMUTABLE_FL == 0x00000010, "found 0x%.8x\n",
-                 LUSTRE_IMMUTABLE_FL);
-        LASSERTF(LUSTRE_APPEND_FL == 0x00000020, "found 0x%.8x\n",
-                 LUSTRE_APPEND_FL);
-        LASSERTF(LUSTRE_NOATIME_FL == 0x00000080, "found 0x%.8x\n",
-                 LUSTRE_NOATIME_FL);
-        LASSERTF(LUSTRE_DIRSYNC_FL == 0x00010000, "found 0x%.8x\n",
-                 LUSTRE_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);
-        LASSERTF(MDS_INODELOCK_LAYOUT == 0x000008, "found 0x%.8x\n",
-                 MDS_INODELOCK_LAYOUT);
+       /* 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_BY_FID == 000040000000UL, "found 0%.11oUL\n",
+               MDS_OPEN_BY_FID);
+       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_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_OPEN_VOLATILE == 00000000000400000000000ULL, "found 0%.22lloULL\n",
+                       (long long)MDS_OPEN_VOLATILE);
+       LASSERTF(LUSTRE_SYNC_FL == 0x00000008, "found 0x%.8x\n",
+               LUSTRE_SYNC_FL);
+       LASSERTF(LUSTRE_IMMUTABLE_FL == 0x00000010, "found 0x%.8x\n",
+               LUSTRE_IMMUTABLE_FL);
+       LASSERTF(LUSTRE_APPEND_FL == 0x00000020, "found 0x%.8x\n",
+               LUSTRE_APPEND_FL);
+       LASSERTF(LUSTRE_NOATIME_FL == 0x00000080, "found 0x%.8x\n",
+               LUSTRE_NOATIME_FL);
+       LASSERTF(LUSTRE_DIRSYNC_FL == 0x00010000, "found 0x%.8x\n",
+               LUSTRE_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);
+       LASSERTF(MDS_INODELOCK_LAYOUT == 0x000008, "found 0x%.8x\n",
+               MDS_INODELOCK_LAYOUT);
 
-        /* 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_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_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",
-                 (long long)(int)sizeof(struct mdt_rec_setattr));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_suppgid));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_fid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_valid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_uid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_gid));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_size));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_blocks));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_mtime));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_atime));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_ctime));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_mode));
-        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_bias) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_rec_setattr, sa_bias));
-        LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_padding_5));
+       /* Checks for struct mdt_rec_setattr */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_suppgid));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_fid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_valid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_uid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_gid));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_size));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_blocks));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_mtime));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_atime));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_ctime));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_mode));
+       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_bias) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_setattr, sa_bias));
+       LASSERTF((int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_setattr *)0)->sa_bias));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_create));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_fid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_time));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_rdev));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_ioepoch));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_mode));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_bias));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_flags_h));
-        LASSERTF((int)offsetof(struct mdt_rec_create, cr_umask) == 128, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_rec_create, cr_umask));
-        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_umask) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_umask));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_padding_4));
+       /* Checks for struct mdt_rec_create */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_fid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_time));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_rdev));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_ioepoch));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_mode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_bias));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_flags_h));
+       LASSERTF((int)offsetof(struct mdt_rec_create, cr_umask) == 128, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_umask));
+       LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_umask) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_umask));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_link));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_fid2));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_time));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_link, lk_bias));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_link *)0)->lk_padding_9));
+       /* Checks for struct mdt_rec_link */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_fid2));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_time));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_link, lk_bias));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_unlink));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid2));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_time));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_bias));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_unlink, ul_mode));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_unlink *)0)->ul_padding_9));
+       /* Checks for struct mdt_rec_unlink */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_fid2));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_time));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_bias));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_unlink, ul_mode));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct mdt_rec_rename));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_opcode));
-        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",
-                 (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_cap));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_fsgid));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid1));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid2));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_fid1));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_fid2));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_time));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_bias));
-        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",
-                 (long long)(int)offsetof(struct mdt_rec_rename, rn_mode));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct mdt_rec_rename *)0)->rn_padding_8));
+       /* Checks for struct mdt_rec_rename */
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_opcode));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_cap));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fsuid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fsgid));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid1));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_suppgid2));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fid1));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_fid2));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_time));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_bias));
+       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",
+                (long long)(int)offsetof(struct mdt_rec_rename, rn_mode));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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_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 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_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 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",
-                 (long long)(int)sizeof(struct lov_desc));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_count));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_pattern));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_qos_maxage));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_1));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_2));
-        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",
-                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_uuid));
-        CLASSERT(LOV_DESC_MAGIC == 0xB0CCDE5C);
+       /* Checks for struct lov_desc */
+       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",
+                (long long)(int)offsetof(struct lov_desc, ld_tgt_count));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_count));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_pattern));
+       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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_qos_maxage));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_1));
+       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",
+                (long long)(int)sizeof(((struct lov_desc *)0)->ld_padding_2));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct ldlm_res_id));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_res_id *)0)->name[4]));
+       /* Checks for struct ldlm_res_id */
+       LASSERTF((int)sizeof(struct ldlm_res_id) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct ldlm_res_id));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct ldlm_extent));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_extent *)0)->start));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_extent *)0)->end));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_extent *)0)->gid));
+       /* Checks for struct ldlm_extent */
+       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",
+                (long long)(int)offsetof(struct ldlm_extent, start));
+       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",
+                (long long)(int)offsetof(struct ldlm_extent, end));
+       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",
+                (long long)(int)offsetof(struct ldlm_extent, gid));
+       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_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",
-                 (long long)(int)sizeof(struct ldlm_flock_wire));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_start));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_end));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_owner));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_pid));
+       /* Checks for struct ldlm_flock_wire */
+       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",
+                (long long)(int)offsetof(struct ldlm_flock_wire, lfw_start));
+       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",
+                (long long)(int)offsetof(struct ldlm_flock_wire, lfw_end));
+       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",
+                (long long)(int)offsetof(struct ldlm_flock_wire, lfw_owner));
+       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_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",
+                (long long)(int)sizeof(((struct ldlm_flock_wire *)0)->lfw_pid));
 
-        /* Checks for struct ldlm_intent */
-        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",
-                 (long long)(int)offsetof(struct ldlm_intent, opc));
-        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_intent */
+       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",
+                (long long)(int)offsetof(struct ldlm_intent, opc));
+       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",
-                 (long long)(int)sizeof(struct ldlm_resource_desc));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_type));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_padding));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_name));
+       /* Checks for struct ldlm_resource_desc */
+       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",
+                (long long)(int)offsetof(struct ldlm_resource_desc, lr_type));
+       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",
+                (long long)(int)offsetof(struct ldlm_resource_desc, lr_padding));
+       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",
+                (long long)(int)offsetof(struct ldlm_resource_desc, lr_name));
+       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",
-                 (long long)(int)sizeof(struct ldlm_lock_desc));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data));
+       /* Checks for struct ldlm_lock_desc */
+       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",
+                (long long)(int)offsetof(struct ldlm_lock_desc, l_resource));
+       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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
-                 (long long)(int)sizeof(struct ldlm_request));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_flags));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_count));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_desc));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle));
+       /* Checks for struct ldlm_request */
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_flags));
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_count));
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_desc));
+       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",
+                (long long)(int)offsetof(struct ldlm_request, lock_handle));
+       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",
-                 (long long)(int)sizeof(struct ldlm_reply));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_flags));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_padding));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_desc));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_handle));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1));
-        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",
-                 (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2));
+       /* Checks for struct ldlm_reply */
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_flags));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_padding));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_desc));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_handle));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_policy_res1));
+       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",
+                (long long)(int)offsetof(struct ldlm_reply, lock_policy_res2));
+       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_v1 */
-        LASSERTF((int)sizeof(struct ost_lvb_v1) == 40, "found %lld\n",
-                 (long long)(int)sizeof(struct ost_lvb_v1));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_size) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_size));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_mtime) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_mtime));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_atime) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_atime));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_ctime) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_ctime));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime));
-        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_blocks) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_blocks));
-        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks));
+       /* Checks for struct ost_lvb_v1 */
+       LASSERTF((int)sizeof(struct ost_lvb_v1) == 40, "found %lld\n",
+                (long long)(int)sizeof(struct ost_lvb_v1));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_size) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_size));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_mtime) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_mtime));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_atime) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_atime));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_ctime) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_ctime));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime));
+       LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_blocks) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb_v1, lvb_blocks));
+       LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks));
 
-        /* Checks for struct ost_lvb */
-        LASSERTF((int)sizeof(struct ost_lvb) == 56, "found %lld\n",
-                 (long long)(int)sizeof(struct ost_lvb));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_size));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime));
-        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",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_mtime_ns) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_mtime_ns));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_atime_ns) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_atime_ns));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_ctime_ns) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_ctime_ns));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns));
-        LASSERTF((int)offsetof(struct ost_lvb, lvb_padding) == 52, "found %lld\n",
-                 (long long)(int)offsetof(struct ost_lvb, lvb_padding));
-        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_padding));
+       /* Checks for struct ost_lvb */
+       LASSERTF((int)sizeof(struct ost_lvb) == 56, "found %lld\n",
+                (long long)(int)sizeof(struct ost_lvb));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_size));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime));
+       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",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_mtime_ns) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_mtime_ns));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_atime_ns) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_atime_ns));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_ctime_ns) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_ctime_ns));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns));
+       LASSERTF((int)offsetof(struct ost_lvb, lvb_padding) == 52, "found %lld\n",
+                (long long)(int)offsetof(struct ost_lvb, lvb_padding));
+       LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_padding));
 
-        /* Checks for struct lquota_lvb */
-        LASSERTF((int)sizeof(struct lquota_lvb) == 40, "found %lld\n",
-                 (long long)(int)sizeof(struct lquota_lvb));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_flags) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_flags));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_flags) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_flags));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_may_rel) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_may_rel));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_rel) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_rel));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_qunit) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_qunit));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit));
-        LASSERTF((int)offsetof(struct lquota_lvb, lvb_pad1) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct lquota_lvb, lvb_pad1));
-        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_pad1) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_pad1));
-        LASSERTF(LQUOTA_FL_EDQUOT == 1, "found %lld\n",
-                 (long long)LQUOTA_FL_EDQUOT);
+       /* Checks for struct lquota_lvb */
+       LASSERTF((int)sizeof(struct lquota_lvb) == 40, "found %lld\n",
+                (long long)(int)sizeof(struct lquota_lvb));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_flags) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_flags));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_flags) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_flags));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_may_rel) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_id_may_rel));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_rel) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_id_rel));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_qunit) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_id_qunit));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit));
+       LASSERTF((int)offsetof(struct lquota_lvb, lvb_pad1) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct lquota_lvb, lvb_pad1));
+       LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_pad1) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_pad1));
+       LASSERTF(LQUOTA_FL_EDQUOT == 1, "found %lld\n",
+                (long long)LQUOTA_FL_EDQUOT);
 
-        /* Checks for struct ldlm_gl_lquota_desc */
-        LASSERTF((int)sizeof(struct ldlm_gl_lquota_desc) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct ldlm_gl_lquota_desc));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_id) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_id));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_flags) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_flags));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_ver) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_ver));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_time) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_time));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time));
-        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2));
-        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2));
+       /* Checks for struct ldlm_gl_lquota_desc */
+       LASSERTF((int)sizeof(struct ldlm_gl_lquota_desc) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct ldlm_gl_lquota_desc));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_id) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_id));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_flags) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_flags));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_ver) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_ver));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_time) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_time));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_time));
+       LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2));
+       LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2));
 
-        /* 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 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",
-                 (long long)(int)sizeof(struct cfg_marker));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_step));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_flags));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_vers));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_createtime));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_canceltime));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_tgtname));
-        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",
-                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_comment));
+       /* Checks for struct cfg_marker */
+       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",
+                (long long)(int)offsetof(struct cfg_marker, cm_step));
+       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",
+                (long long)(int)offsetof(struct cfg_marker, cm_flags));
+       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",
+                (long long)(int)offsetof(struct cfg_marker, cm_vers));
+       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_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",
+                (long long)(int)sizeof(((struct cfg_marker *)0)->cm_createtime));
+       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",
+                (long long)(int)sizeof(((struct cfg_marker *)0)->cm_canceltime));
+       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",
+                (long long)(int)sizeof(((struct cfg_marker *)0)->cm_tgtname));
+       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",
+                (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",
-                 (long long)(int)sizeof(struct llog_logid));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid *)0)->lgl_oid));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid *)0)->lgl_oseq));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid *)0)->lgl_ogen));
-        CLASSERT(OST_SZ_REC == 274730752);
-        CLASSERT(MDS_UNLINK_REC == 274801668);
-        CLASSERT(MDS_UNLINK64_REC == 275325956);
-        CLASSERT(MDS_SETATTR64_REC == 275325953);
-        CLASSERT(OBD_CFG_REC == 274857984);
-        CLASSERT(LLOG_GEN_REC == 274989056);
-        CLASSERT(CHANGELOG_REC == 275120128);
-        CLASSERT(CHANGELOG_USER_REC == 275185664);
-        CLASSERT(LLOG_HDR_MAGIC == 275010873);
-        CLASSERT(LLOG_LOGID_MAGIC == 275010875);
+       /* Checks for struct llog_logid */
+       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",
+                (long long)(int)offsetof(struct llog_logid, lgl_oid));
+       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",
+                (long long)(int)offsetof(struct llog_logid, lgl_oseq));
+       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",
+                (long long)(int)offsetof(struct llog_logid, lgl_ogen));
+       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(MDS_UNLINK_REC == 274801668);
+       CLASSERT(MDS_UNLINK64_REC == 275325956);
+       CLASSERT(MDS_SETATTR64_REC == 275325953);
+       CLASSERT(OBD_CFG_REC == 274857984);
+       CLASSERT(LLOG_GEN_REC == 274989056);
+       CLASSERT(CHANGELOG_REC == 275120128);
+       CLASSERT(CHANGELOG_USER_REC == 275185664);
+       CLASSERT(LLOG_HDR_MAGIC == 275010873);
+       CLASSERT(LLOG_LOGID_MAGIC == 275010875);
 
-        /* Checks for struct llog_catid */
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_logid));
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_padding1));
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_padding2));
-        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",
-                 (long long)(int)offsetof(struct llog_catid, lci_padding3));
-        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_catid */
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_logid));
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_padding1));
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_padding2));
+       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",
+                (long long)(int)offsetof(struct llog_catid, lci_padding3));
+       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",
-                 (long long)(int)sizeof(struct llog_rec_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_len));
-        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",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_index));
-        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",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_type));
-        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_id) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_rec_hdr, lrh_id));
-        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_id) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_id));
+       /* Checks for struct llog_rec_hdr */
+       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",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_len));
+       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",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_index));
+       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",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_type));
+       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, lrh_id) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct llog_rec_hdr, lrh_id));
+       LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_id) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_id));
 
-        /* Checks for struct llog_rec_tail */
-        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",
-                 (long long)(int)offsetof(struct llog_rec_tail, lrt_len));
-        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",
-                 (long long)(int)offsetof(struct llog_rec_tail, lrt_index));
-        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_rec_tail */
+       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",
+                (long long)(int)offsetof(struct llog_rec_tail, lrt_len));
+       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",
+                (long long)(int)offsetof(struct llog_rec_tail, lrt_index));
+       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",
-                 (long long)(int)sizeof(struct llog_logid_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_id));
-        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) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding2));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding3) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding3));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding3));
-        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",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_tail));
+       /* Checks for struct llog_logid_rec */
+       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",
+                (long long)(int)offsetof(struct llog_logid_rec, lid_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_logid_rec, lid_id));
+       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, 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) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding2));
+       LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding3) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_logid_rec, lid_padding3));
+       LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding3));
+       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",
+                (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_tail));
 
-        /* Checks for struct llog_unlink_rec */
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_hdr));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_oid));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_oseq));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_count));
-        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",
-                 (long long)(int)offsetof(struct llog_unlink_rec, lur_tail));
-        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_unlink64_rec */
-        LASSERTF((int)sizeof(struct llog_unlink64_rec) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_unlink64_rec));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_hdr) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_hdr));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_fid) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_fid));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_count) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_count));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_count) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_count));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_tail) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_tail));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding1) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding1));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding2) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding2));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2));
-        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding3) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding3));
-        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3));
+       /* Checks for struct llog_unlink_rec */
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_oid));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_oseq));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_count));
+       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",
+                (long long)(int)offsetof(struct llog_unlink_rec, lur_tail));
+       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_unlink64_rec */
+       LASSERTF((int)sizeof(struct llog_unlink64_rec) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct llog_unlink64_rec));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_hdr) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_hdr));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_fid) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_fid));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_count) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_count));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_count));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_tail) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_tail));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding1) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding1));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding2) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding2));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2));
+       LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding3) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding3));
+       LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3));
 
-        /* Checks for struct llog_setattr64_rec */
-        LASSERTF((int)sizeof(struct llog_setattr64_rec) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_setattr64_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid));
-        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) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_gid));
-        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",
-                 (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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_padding) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_padding));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 56, "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",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail));
+       /* Checks for struct llog_setattr64_rec */
+       LASSERTF((int)sizeof(struct llog_setattr64_rec) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct llog_setattr64_rec));
+       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",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr));
+       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",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid));
+       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) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq));
+       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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct llog_setattr64_rec, lsr_gid));
+       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",
+                (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",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_padding) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_setattr64_rec, lsr_padding));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 56, "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",
+                (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) == 64, "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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding1) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding1));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding2) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding2));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding3) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding3));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 56, "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",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_tail));
+       /* Checks for struct llog_size_change_rec */
+       LASSERTF((int)sizeof(struct llog_size_change_rec) == 64, "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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (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",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding1) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding1));
+       LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding2) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding2));
+       LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding3) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding3));
+       LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3));
+       LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 56, "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",
+                (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",
-                 (long long)(int)sizeof(struct changelog_rec));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_namelen));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_flags));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_type));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_index));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_prev));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_time));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_tfid));
-        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",
-                 (long long)(int)sizeof(((struct changelog_rec *)0)->cr_pfid));
+       /* Checks for struct changelog_rec */
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_namelen));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_flags));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_type));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_index));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_prev));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_time));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_tfid));
+       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",
+                (long long)(int)offsetof(struct changelog_rec, cr_pfid));
+       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_ext_rec */
-        LASSERTF((int)sizeof(struct changelog_ext_rec) == 96, "found %lld\n",
-                 (long long)(int)sizeof(struct changelog_ext_rec));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_namelen) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_namelen));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_flags) == 2, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_flags));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_flags) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_flags));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_type) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_type));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_type) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_type));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_index) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_index));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_index) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_index));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_prev) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_prev));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_prev) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_prev));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_time) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_time));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_time) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_time));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_tfid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_tfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_pfid) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_pfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_sfid) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_sfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid));
-        LASSERTF((int)offsetof(struct changelog_ext_rec, cr_spfid) == 80, "found %lld\n",
-                 (long long)(int)offsetof(struct changelog_ext_rec, cr_spfid));
-        LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid));
+       /* Checks for struct changelog_ext_rec */
+       LASSERTF((int)sizeof(struct changelog_ext_rec) == 96, "found %lld\n",
+                (long long)(int)sizeof(struct changelog_ext_rec));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_namelen) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_namelen));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_namelen));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_flags) == 2, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_flags));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_flags));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_type) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_type));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_type) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_type));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_index) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_index));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_index) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_index));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_prev) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_prev));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_prev) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_prev));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_time) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_time));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_time) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_time));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_tfid) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_tfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_tfid));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_pfid) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_pfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_pfid));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_sfid) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_sfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_sfid));
+       LASSERTF((int)offsetof(struct changelog_ext_rec, cr_spfid) == 80, "found %lld\n",
+                (long long)(int)offsetof(struct changelog_ext_rec, cr_spfid));
+       LASSERTF((int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct changelog_ext_rec *)0)->cr_spfid));
 
-        /* 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 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",
-                 (long long)(int)sizeof(struct llog_changelog_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr));
-        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",
-                 (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_tail));
+       /* Checks for struct llog_changelog_rec */
+       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",
+                (long long)(int)offsetof(struct llog_changelog_rec, cr_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_changelog_rec, cr));
+       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",
+                (long long)(int)offsetof(struct llog_changelog_rec, cr_tail));
+       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_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",
-                 (long long)(int)sizeof(struct llog_gen));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen *)0)->mnt_cnt));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen *)0)->conn_cnt));
+       /* Checks for struct llog_gen */
+       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",
+                (long long)(int)offsetof(struct llog_gen, mnt_cnt));
+       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",
+                (long long)(int)offsetof(struct llog_gen, conn_cnt));
+       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) == 64, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_gen_rec));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_gen));
-        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 56, "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",
-                 (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_tail));
+       /* Checks for struct llog_gen_rec */
+       LASSERTF((int)sizeof(struct llog_gen_rec) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct llog_gen_rec));
+       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",
+                (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_hdr));
+       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",
+                (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_gen));
+       LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 56, "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",
+                (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",
-                 (long long)(int)sizeof(struct llog_log_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_hdr));
-        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",
-                 (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_timestamp));
-        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",
-                 (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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_size));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_flags));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_tgtuuid));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_reserved));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_bitmap));
-        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",
-                 (long long)(int)offsetof(struct llog_log_hdr, llh_tail));
-        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_log_hdr */
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_hdr));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_timestamp));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_count));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_size));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_flags));
+       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",
+                (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",
+                (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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_tgtuuid));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_reserved));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_bitmap));
+       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",
+                (long long)(int)offsetof(struct llog_log_hdr, llh_tail));
+       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",
-                 (long long)(int)sizeof(struct llog_cookie));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_lgl));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_subsys));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_index));
-        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",
-                 (long long)(int)sizeof(((struct llog_cookie *)0)->lgc_padding));
+       /* Checks for struct llog_cookie */
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_lgl));
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_subsys));
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_index));
+       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",
+                (long long)(int)offsetof(struct llog_cookie, lgc_padding));
+       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",
-                 (long long)(int)sizeof(struct llogd_body));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_logid));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_ctxt_idx));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_llh_flags));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_index));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_saved_index));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_len));
-        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",
-                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_cur_offset));
-        CLASSERT(LLOG_ORIGIN_HANDLE_CREATE == 501);
-        CLASSERT(LLOG_ORIGIN_HANDLE_NEXT_BLOCK == 502);
-        CLASSERT(LLOG_ORIGIN_HANDLE_READ_HEADER == 503);
-        CLASSERT(LLOG_ORIGIN_HANDLE_WRITE_REC == 504);
-        CLASSERT(LLOG_ORIGIN_HANDLE_CLOSE == 505);
-        CLASSERT(LLOG_ORIGIN_CONNECT == 506);
-        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_body */
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_logid));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_ctxt_idx));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_llh_flags));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_index));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_saved_index));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_len));
+       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",
+                (long long)(int)offsetof(struct llogd_body, lgd_cur_offset));
+       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);
+       CLASSERT(LLOG_ORIGIN_HANDLE_READ_HEADER == 503);
+       CLASSERT(LLOG_ORIGIN_HANDLE_WRITE_REC == 504);
+       CLASSERT(LLOG_ORIGIN_HANDLE_CLOSE == 505);
+       CLASSERT(LLOG_ORIGIN_CONNECT == 506);
+       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",
-                 (long long)(int)sizeof(struct llogd_conn_body));
-        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",
-                 (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_gen));
-        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",
-                 (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",
-                 (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",
-                 (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
+       /* Checks for struct llogd_conn_body */
+       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",
+                (long long)(int)offsetof(struct llogd_conn_body, lgdc_gen));
+       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",
+                (long long)(int)offsetof(struct llogd_conn_body, lgdc_logid));
+       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",
+                (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",
+                (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 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 quota_body */
-        LASSERTF((int)sizeof(struct quota_body) == 112, "found %lld\n",
-                 (long long)(int)sizeof(struct quota_body));
-        LASSERTF((int)offsetof(struct quota_body, qb_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_fid));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_fid));
-        LASSERTF((int)offsetof(struct quota_body, qb_id) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_id));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_id) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_id));
-        LASSERTF((int)offsetof(struct quota_body, qb_flags) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_flags));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_flags));
-        LASSERTF((int)offsetof(struct quota_body, qb_padding) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_padding));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_padding));
-        LASSERTF((int)offsetof(struct quota_body, qb_count) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_count));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_count) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_count));
-        LASSERTF((int)offsetof(struct quota_body, qb_usage) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_usage));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_usage) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_usage));
-        LASSERTF((int)offsetof(struct quota_body, qb_slv_ver) == 56, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_slv_ver));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_slv_ver) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_slv_ver));
-        LASSERTF((int)offsetof(struct quota_body, qb_lockh) == 64, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_lockh));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_lockh) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_lockh));
-        LASSERTF((int)offsetof(struct quota_body, qb_glb_lockh) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_glb_lockh));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_glb_lockh) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_glb_lockh));
-        LASSERTF((int)offsetof(struct quota_body, qb_padding1[4]) == 112, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_body, qb_padding1[4]));
-        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding1[4]) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_body *)0)->qb_padding1[4]));
+       /* Checks for struct quota_body */
+       LASSERTF((int)sizeof(struct quota_body) == 112, "found %lld\n",
+                (long long)(int)sizeof(struct quota_body));
+       LASSERTF((int)offsetof(struct quota_body, qb_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_fid));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_fid));
+       LASSERTF((int)offsetof(struct quota_body, qb_id) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_id));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_id) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_id));
+       LASSERTF((int)offsetof(struct quota_body, qb_flags) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_flags));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_flags));
+       LASSERTF((int)offsetof(struct quota_body, qb_padding) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_padding));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_padding));
+       LASSERTF((int)offsetof(struct quota_body, qb_count) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_count));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_count) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_count));
+       LASSERTF((int)offsetof(struct quota_body, qb_usage) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_usage));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_usage) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_usage));
+       LASSERTF((int)offsetof(struct quota_body, qb_slv_ver) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_slv_ver));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_slv_ver) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_slv_ver));
+       LASSERTF((int)offsetof(struct quota_body, qb_lockh) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_lockh));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_lockh) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_lockh));
+       LASSERTF((int)offsetof(struct quota_body, qb_glb_lockh) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_glb_lockh));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_glb_lockh) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_glb_lockh));
+       LASSERTF((int)offsetof(struct quota_body, qb_padding1[4]) == 112, "found %lld\n",
+                (long long)(int)offsetof(struct quota_body, qb_padding1[4]));
+       LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding1[4]) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct quota_body *)0)->qb_padding1[4]));
 
-        /* Checks for struct mgs_target_info */
-        LASSERTF((int)sizeof(struct mgs_target_info) == 4544, "found %lld\n",
-                 (long long)(int)sizeof(struct mgs_target_info));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_lustre_ver) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_lustre_ver));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_stripe_index) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_stripe_index));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_config_ver) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_config_ver));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_config_ver) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_config_ver));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_flags) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_flags));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_flags));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_nid_count) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_nid_count));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nid_count) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nid_count));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_instance) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_instance));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_instance) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_instance));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_fsname) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_fsname));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_fsname) == 64, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_fsname));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_svname) == 88, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_svname));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_svname) == 64, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_svname));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_uuid) == 152, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_uuid));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_uuid) == 40, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_uuid));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_nids) == 192, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_nids));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nids) == 256, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nids));
-        LASSERTF((int)offsetof(struct mgs_target_info, mti_params) == 448, "found %lld\n",
-                 (long long)(int)offsetof(struct mgs_target_info, mti_params));
-        LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_params) == 4096, "found %lld\n",
-                 (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_params));
+       /* Checks for struct mgs_target_info */
+       LASSERTF((int)sizeof(struct mgs_target_info) == 4544, "found %lld\n",
+                (long long)(int)sizeof(struct mgs_target_info));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_lustre_ver) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_lustre_ver));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_lustre_ver));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_stripe_index) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_stripe_index));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_stripe_index));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_config_ver) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_config_ver));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_config_ver) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_config_ver));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_flags) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_flags));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_flags));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_nid_count) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_nid_count));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nid_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nid_count));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_instance) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_instance));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_instance) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_instance));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_fsname) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_fsname));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_fsname) == 64, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_fsname));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_svname) == 88, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_svname));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_svname) == 64, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_svname));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_uuid) == 152, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_uuid));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_uuid) == 40, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_uuid));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_nids) == 192, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_nids));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_nids) == 256, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_nids));
+       LASSERTF((int)offsetof(struct mgs_target_info, mti_params) == 448, "found %lld\n",
+                (long long)(int)offsetof(struct mgs_target_info, mti_params));
+       LASSERTF((int)sizeof(((struct mgs_target_info *)0)->mti_params) == 4096, "found %lld\n",
+                (long long)(int)sizeof(((struct mgs_target_info *)0)->mti_params));
 
-        /* Checks for struct lustre_capa */
-        LASSERTF((int)sizeof(struct lustre_capa) == 120, "found %lld\n",
-                 (long long)(int)sizeof(struct lustre_capa));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_fid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_fid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_opc) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_opc));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_opc) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_opc));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_uid) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_uid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_uid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_uid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_gid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_gid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_gid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_gid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_flags) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_flags));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_flags));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_keyid) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_keyid));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_keyid) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_keyid));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_timeout) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_timeout));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_timeout) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_timeout));
-        LASSERTF((int)offsetof(struct lustre_capa, lc_expiry) == 52, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_expiry));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_expiry) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_expiry));
-        CLASSERT(CAPA_HMAC_MAX_LEN == 64);
-        LASSERTF((int)offsetof(struct lustre_capa, lc_hmac[64]) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa, lc_hmac[64]));
-        LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]));
+       /* Checks for struct lustre_capa */
+       LASSERTF((int)sizeof(struct lustre_capa) == 120, "found %lld\n",
+                (long long)(int)sizeof(struct lustre_capa));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_fid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_fid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_opc) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_opc));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_opc) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_opc));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_uid) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_uid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_uid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_uid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_gid) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_gid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_gid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_gid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_flags));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_flags));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_keyid) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_keyid));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_keyid) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_keyid));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_timeout) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_timeout));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_timeout) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_timeout));
+       LASSERTF((int)offsetof(struct lustre_capa, lc_expiry) == 52, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_expiry));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_expiry) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_expiry));
+       CLASSERT(CAPA_HMAC_MAX_LEN == 64);
+       LASSERTF((int)offsetof(struct lustre_capa, lc_hmac[64]) == 120, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa, lc_hmac[64]));
+       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]));
 
-        /* Checks for struct lustre_capa_key */
-        LASSERTF((int)sizeof(struct lustre_capa_key) == 72, "found %lld\n",
-                 (long long)(int)sizeof(struct lustre_capa_key));
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_seq) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_seq));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_seq) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_seq));
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_keyid) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_keyid));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_keyid) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_keyid));
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_padding) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_padding));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_padding));
-        CLASSERT(CAPA_HMAC_KEY_MAX_LEN == 56);
-        LASSERTF((int)offsetof(struct lustre_capa_key, lk_key[56]) == 72, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_capa_key, lk_key[56]));
-        LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]));
+       /* Checks for struct lustre_capa_key */
+       LASSERTF((int)sizeof(struct lustre_capa_key) == 72, "found %lld\n",
+                (long long)(int)sizeof(struct lustre_capa_key));
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_seq) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_seq));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_seq) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_seq));
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_keyid) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_keyid));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_keyid) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_keyid));
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_padding) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_padding));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_padding));
+       CLASSERT(CAPA_HMAC_KEY_MAX_LEN == 56);
+       LASSERTF((int)offsetof(struct lustre_capa_key, lk_key[56]) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_capa_key, lk_key[56]));
+       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]));
 
-        /* Checks for struct getinfo_fid2path */
-        LASSERTF((int)sizeof(struct getinfo_fid2path) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct getinfo_fid2path));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_fid));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_fid));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_recno) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_recno));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_recno) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_recno));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_linkno) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_linkno));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_pathlen) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_pathlen));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen));
-        LASSERTF((int)offsetof(struct getinfo_fid2path, gf_path[0]) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct getinfo_fid2path, gf_path[0]));
-        LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]));
+       /* Checks for struct getinfo_fid2path */
+       LASSERTF((int)sizeof(struct getinfo_fid2path) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct getinfo_fid2path));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_fid));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_fid));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_recno) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_recno));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_recno) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_recno));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_linkno) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_linkno));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_linkno));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_pathlen) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_pathlen));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_pathlen));
+       LASSERTF((int)offsetof(struct getinfo_fid2path, gf_path[0]) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct getinfo_fid2path, gf_path[0]));
+       LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]));
 
-        /* Checks for struct ll_user_fiemap */
-        LASSERTF((int)sizeof(struct ll_user_fiemap) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct ll_user_fiemap));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_start) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_start));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_start) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_start));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_length) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_length));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_length) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_length));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_flags) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_flags));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_flags));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_mapped_extents) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_mapped_extents));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extent_count) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_extent_count));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_reserved) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_reserved));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extents) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_extents));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extents) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extents));
-        CLASSERT(FIEMAP_FLAG_SYNC == 0x00000001);
-        CLASSERT(FIEMAP_FLAG_XATTR == 0x00000002);
-        CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000);
+       /* Checks for struct ll_user_fiemap */
+       LASSERTF((int)sizeof(struct ll_user_fiemap) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct ll_user_fiemap));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_start) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_start));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_start) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_start));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_length) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_length));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_length) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_length));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_flags) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_flags));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_flags));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_mapped_extents) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_mapped_extents));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extent_count) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_extent_count));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_reserved) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_reserved));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved));
+       LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extents) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct ll_user_fiemap, fm_extents));
+       LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extents) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extents));
+       CLASSERT(FIEMAP_FLAG_SYNC == 0x00000001);
+       CLASSERT(FIEMAP_FLAG_XATTR == 0x00000002);
+       CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000);
 
-        /* Checks for struct ll_fiemap_extent */
-        LASSERTF((int)sizeof(struct ll_fiemap_extent) == 56, "found %lld\n",
-                 (long long)(int)sizeof(struct ll_fiemap_extent));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_logical) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_logical));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_physical) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_physical));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_length) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_length));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_length) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_length));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_flags));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_device));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_device) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_device));
-        CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
-        CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
-        CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004);
-        CLASSERT(FIEMAP_EXTENT_ENCODED == 0x00000008);
-        CLASSERT(FIEMAP_EXTENT_DATA_ENCRYPTED == 0x00000080);
-        CLASSERT(FIEMAP_EXTENT_NOT_ALIGNED == 0x00000100);
-        CLASSERT(FIEMAP_EXTENT_DATA_INLINE == 0x00000200);
-        CLASSERT(FIEMAP_EXTENT_DATA_TAIL == 0x00000400);
-        CLASSERT(FIEMAP_EXTENT_UNWRITTEN == 0x00000800);
-        CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000);
-        CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
-        CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
+       /* Checks for struct ll_fiemap_extent */
+       LASSERTF((int)sizeof(struct ll_fiemap_extent) == 56, "found %lld\n",
+                (long long)(int)sizeof(struct ll_fiemap_extent));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_logical) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_logical));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_physical) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_physical));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_length) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_length));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_length) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_length));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_flags));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags));
+       LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct ll_fiemap_extent, fe_device));
+       LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_device) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_device));
+       CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
+       CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
+       CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004);
+       CLASSERT(FIEMAP_EXTENT_ENCODED == 0x00000008);
+       CLASSERT(FIEMAP_EXTENT_DATA_ENCRYPTED == 0x00000080);
+       CLASSERT(FIEMAP_EXTENT_NOT_ALIGNED == 0x00000100);
+       CLASSERT(FIEMAP_EXTENT_DATA_INLINE == 0x00000200);
+       CLASSERT(FIEMAP_EXTENT_DATA_TAIL == 0x00000400);
+       CLASSERT(FIEMAP_EXTENT_UNWRITTEN == 0x00000800);
+       CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000);
+       CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
+       CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
 #ifdef LIBLUSTRE_POSIX_ACL
 
-        /* Checks for type posix_acl_xattr_entry */
-        LASSERTF((int)sizeof(posix_acl_xattr_entry) == 8, "found %lld\n",
-                 (long long)(int)sizeof(posix_acl_xattr_entry));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_tag) == 0, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_tag));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_tag) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_tag));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_perm) == 2, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_perm));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_perm) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_perm));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_id) == 4, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_id));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_id) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_id));
+       /* Checks for type posix_acl_xattr_entry */
+       LASSERTF((int)sizeof(posix_acl_xattr_entry) == 8, "found %lld\n",
+                (long long)(int)sizeof(posix_acl_xattr_entry));
+       LASSERTF((int)offsetof(posix_acl_xattr_entry, e_tag) == 0, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_entry, e_tag));
+       LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_tag) == 2, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_tag));
+       LASSERTF((int)offsetof(posix_acl_xattr_entry, e_perm) == 2, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_entry, e_perm));
+       LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_perm) == 2, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_perm));
+       LASSERTF((int)offsetof(posix_acl_xattr_entry, e_id) == 4, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_entry, e_id));
+       LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_id) == 4, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_id));
 
-        /* Checks for type posix_acl_xattr_header */
-        LASSERTF((int)sizeof(posix_acl_xattr_header) == 4, "found %lld\n",
-                 (long long)(int)sizeof(posix_acl_xattr_header));
-        LASSERTF((int)offsetof(posix_acl_xattr_header, a_version) == 0, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_header, a_version));
-        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_version) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_version));
-        LASSERTF((int)offsetof(posix_acl_xattr_header, a_entries) == 4, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_header, a_entries));
-        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_entries) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_entries));
+       /* Checks for type posix_acl_xattr_header */
+       LASSERTF((int)sizeof(posix_acl_xattr_header) == 4, "found %lld\n",
+                (long long)(int)sizeof(posix_acl_xattr_header));
+       LASSERTF((int)offsetof(posix_acl_xattr_header, a_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_header, a_version));
+       LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_version));
+       LASSERTF((int)offsetof(posix_acl_xattr_header, a_entries) == 4, "found %lld\n",
+                (long long)(int)offsetof(posix_acl_xattr_header, a_entries));
+       LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_entries) == 0, "found %lld\n",
+                (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_entries));
 #endif
 
-        /* Checks for struct link_ea_header */
-        LASSERTF((int)sizeof(struct link_ea_header) == 24, "found %lld\n",
-                 (long long)(int)sizeof(struct link_ea_header));
-        LASSERTF((int)offsetof(struct link_ea_header, leh_magic) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, leh_magic));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_magic) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->leh_magic));
-        LASSERTF((int)offsetof(struct link_ea_header, leh_reccount) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, leh_reccount));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_reccount) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->leh_reccount));
-        LASSERTF((int)offsetof(struct link_ea_header, leh_len) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, leh_len));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_len) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->leh_len));
-        LASSERTF((int)offsetof(struct link_ea_header, padding1) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, padding1));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding1) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->padding1));
-        LASSERTF((int)offsetof(struct link_ea_header, padding2) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_header, padding2));
-        LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding2) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_header *)0)->padding2));
-        CLASSERT(LINK_EA_MAGIC == 0x11EAF1DFUL);
+       /* Checks for struct link_ea_header */
+       LASSERTF((int)sizeof(struct link_ea_header) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct link_ea_header));
+       LASSERTF((int)offsetof(struct link_ea_header, leh_magic) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, leh_magic));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_magic) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->leh_magic));
+       LASSERTF((int)offsetof(struct link_ea_header, leh_reccount) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, leh_reccount));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_reccount) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->leh_reccount));
+       LASSERTF((int)offsetof(struct link_ea_header, leh_len) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, leh_len));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_len) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->leh_len));
+       LASSERTF((int)offsetof(struct link_ea_header, padding1) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, padding1));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->padding1));
+       LASSERTF((int)offsetof(struct link_ea_header, padding2) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_header, padding2));
+       LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding2) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_header *)0)->padding2));
+       CLASSERT(LINK_EA_MAGIC == 0x11EAF1DFUL);
 
-        /* Checks for struct link_ea_entry */
-        LASSERTF((int)sizeof(struct link_ea_entry) == 18, "found %lld\n",
-                 (long long)(int)sizeof(struct link_ea_entry));
-        LASSERTF((int)offsetof(struct link_ea_entry, lee_reclen) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_entry, lee_reclen));
-        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_reclen) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_reclen));
-        LASSERTF((int)offsetof(struct link_ea_entry, lee_parent_fid) == 2, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_entry, lee_parent_fid));
-        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
-        LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 18, "found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_entry, lee_name));
-        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_name) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_name));
+       /* Checks for struct link_ea_entry */
+       LASSERTF((int)sizeof(struct link_ea_entry) == 18, "found %lld\n",
+                (long long)(int)sizeof(struct link_ea_entry));
+       LASSERTF((int)offsetof(struct link_ea_entry, lee_reclen) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_entry, lee_reclen));
+       LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_reclen) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_reclen));
+       LASSERTF((int)offsetof(struct link_ea_entry, lee_parent_fid) == 2, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_entry, lee_parent_fid));
+       LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
+       LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 18, "found %lld\n",
+                (long long)(int)offsetof(struct link_ea_entry, lee_name));
+       LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_name) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_name));
 
-        /* Checks for struct hsm_user_item */
-        LASSERTF((int)sizeof(struct hsm_user_item) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_user_item));
-        LASSERTF((int)offsetof(struct hsm_user_item, hui_fid) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_item, hui_fid));
-        LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_fid));
-        LASSERTF((int)offsetof(struct hsm_user_item, hui_extent) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_item, hui_extent));
-        LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_extent) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_extent));
+       /* Checks for struct layout_intent */
+       LASSERTF((int)sizeof(struct layout_intent) == 24, "found %lld\n",
+                (long long)(int)sizeof(struct layout_intent));
+       LASSERTF((int)offsetof(struct layout_intent, li_opc) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_opc));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_opc) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_opc));
+       LASSERTF((int)offsetof(struct layout_intent, li_flags) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_flags));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_flags));
+       LASSERTF((int)offsetof(struct layout_intent, li_start) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_start));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_start) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_start));
+       LASSERTF((int)offsetof(struct layout_intent, li_end) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct layout_intent, li_end));
+       LASSERTF((int)sizeof(((struct layout_intent *)0)->li_end) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct layout_intent *)0)->li_end));
+       LASSERTF(LAYOUT_INTENT_ACCESS == 0, "found %lld\n",
+                (long long)LAYOUT_INTENT_ACCESS);
+       LASSERTF(LAYOUT_INTENT_READ == 1, "found %lld\n",
+                (long long)LAYOUT_INTENT_READ);
+       LASSERTF(LAYOUT_INTENT_WRITE == 2, "found %lld\n",
+                (long long)LAYOUT_INTENT_WRITE);
+       LASSERTF(LAYOUT_INTENT_GLIMPSE == 3, "found %lld\n",
+                (long long)LAYOUT_INTENT_GLIMPSE);
+       LASSERTF(LAYOUT_INTENT_TRUNC == 4, "found %lld\n",
+                (long long)LAYOUT_INTENT_TRUNC);
+       LASSERTF(LAYOUT_INTENT_RELEASE == 5, "found %lld\n",
+                (long long)LAYOUT_INTENT_RELEASE);
+       LASSERTF(LAYOUT_INTENT_RESTORE == 6, "found %lld\n",
+                (long long)LAYOUT_INTENT_RESTORE);
 
-        /* Checks for struct hsm_user_request */
-        LASSERTF((int)sizeof(struct hsm_user_request) == 16, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_user_request));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_action) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_action));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_action) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_action));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_archive_num) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_archive_num));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_archive_num) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_archive_num));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_itemcount) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_itemcount));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_itemcount) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_itemcount));
-        LASSERTF((int)offsetof(struct hsm_user_request, hur_data_len) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_request, hur_data_len));
-        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_data_len) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_data_len));
+       /* Checks for struct hsm_action_item */
+       LASSERTF((int)sizeof(struct hsm_action_item) == 72, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_action_item));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_len) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_len));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_len) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_len));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_action) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_action));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_action) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_action));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_fid) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_fid));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_fid));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_dfid) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_dfid));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_dfid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_dfid));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_extent) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_extent));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_extent));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_cookie) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_cookie));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_cookie) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_cookie));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_gid) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_gid));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_gid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_gid));
+       LASSERTF((int)offsetof(struct hsm_action_item, hai_data) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_item, hai_data));
+       LASSERTF((int)sizeof(((struct hsm_action_item *)0)->hai_data) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_item *)0)->hai_data));
 
-        /* Checks for struct hsm_user_state */
-        LASSERTF((int)sizeof(struct hsm_user_state) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct hsm_user_state));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_states) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_states));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_states) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_states));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_archive_num) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_archive_num));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_archive_num) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_archive_num));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_state) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_state));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_action) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_action));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action));
-        LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_location) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_location));
-        LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location));
+       /* Checks for struct hsm_action_list */
+       LASSERTF((int)sizeof(struct hsm_action_list) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_action_list));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_version));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_version));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_count) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_count));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_count) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_count));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_compound_id) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_compound_id));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_compound_id) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_compound_id));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_flags) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_flags));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_flags) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_flags));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_archive_num) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_archive_num));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_archive_num) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_archive_num));
+       LASSERTF((int)offsetof(struct hsm_action_list, padding1) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, padding1));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->padding1));
+       LASSERTF((int)offsetof(struct hsm_action_list, hal_fsname) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_action_list, hal_fsname));
+       LASSERTF((int)sizeof(((struct hsm_action_list *)0)->hal_fsname) == 0, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_action_list *)0)->hal_fsname));
 
-        /* Checks for struct layout_intent */
-        LASSERTF((int)sizeof(struct layout_intent) == 24, "found %lld\n",
-                 (long long)(int)sizeof(struct layout_intent));
-        LASSERTF((int)offsetof(struct layout_intent, li_opc) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_opc));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_opc) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_opc));
-        LASSERTF((int)offsetof(struct layout_intent, li_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_flags));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_flags));
-        LASSERTF((int)offsetof(struct layout_intent, li_start) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_start));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_start) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_start));
-        LASSERTF((int)offsetof(struct layout_intent, li_end) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct layout_intent, li_end));
-        LASSERTF((int)sizeof(((struct layout_intent *)0)->li_end) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct layout_intent *)0)->li_end));
-        LASSERTF(LAYOUT_INTENT_ACCESS == 0, "found %lld\n",
-                 (long long)LAYOUT_INTENT_ACCESS);
-        LASSERTF(LAYOUT_INTENT_READ == 1, "found %lld\n",
-                 (long long)LAYOUT_INTENT_READ);
-        LASSERTF(LAYOUT_INTENT_WRITE == 2, "found %lld\n",
-                 (long long)LAYOUT_INTENT_WRITE);
-        LASSERTF(LAYOUT_INTENT_GLIMPSE == 3, "found %lld\n",
-                 (long long)LAYOUT_INTENT_GLIMPSE);
-        LASSERTF(LAYOUT_INTENT_TRUNC == 4, "found %lld\n",
-                 (long long)LAYOUT_INTENT_TRUNC);
-        LASSERTF(LAYOUT_INTENT_RELEASE == 5, "found %lld\n",
-                 (long long)LAYOUT_INTENT_RELEASE);
-        LASSERTF(LAYOUT_INTENT_RESTORE == 6, "found %lld\n",
-                 (long long)LAYOUT_INTENT_RESTORE);
+       /* Checks for struct hsm_progress */
+       LASSERTF((int)sizeof(struct hsm_progress) == 48, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_progress));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_fid));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_fid));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_cookie) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_cookie));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_cookie) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_cookie));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_extent) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_extent));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_extent));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_flags));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_flags));
+       LASSERTF((int)offsetof(struct hsm_progress, hp_errval) == 42, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, hp_errval));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->hp_errval) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->hp_errval));
+       LASSERTF((int)offsetof(struct hsm_progress, padding) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress, padding));
+       LASSERTF((int)sizeof(((struct hsm_progress *)0)->padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress *)0)->padding));
+       LASSERTF(HP_FLAG_COMPLETED == 0x01, "found 0x%.8x\n",
+               HP_FLAG_COMPLETED);
+       LASSERTF(HP_FLAG_RETRY == 0x02, "found 0x%.8x\n",
+               HP_FLAG_RETRY);
+
+       LASSERTF((int)offsetof(struct hsm_copy, hc_data_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_data_version));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_data_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_data_version));
+       LASSERTF((int)offsetof(struct hsm_copy, hc_flags) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_flags));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_flags));
+       LASSERTF((int)offsetof(struct hsm_copy, hc_errval) == 10, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_errval));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_errval) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_errval));
+       LASSERTF((int)offsetof(struct hsm_copy, padding) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, padding));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->padding) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->padding));
+       LASSERTF((int)offsetof(struct hsm_copy, hc_hai) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_copy, hc_hai));
+       LASSERTF((int)sizeof(((struct hsm_copy *)0)->hc_hai) == 72, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_copy *)0)->hc_hai));
+
+       /* Checks for struct hsm_progress_kernel */
+       LASSERTF((int)sizeof(struct hsm_progress_kernel) == 64, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_progress_kernel));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_fid));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_fid));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_cookie) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_cookie));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_cookie) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_cookie));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_extent) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_extent));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_extent));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_flags) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_flags));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_flags) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_flags));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_errval) == 42, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_errval));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_errval) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_errval));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_padding1) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_padding1));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding1));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_data_version) == 48, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_data_version));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_data_version) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_data_version));
+       LASSERTF((int)offsetof(struct hsm_progress_kernel, hpk_padding2) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_progress_kernel, hpk_padding2));
+       LASSERTF((int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_progress_kernel *)0)->hpk_padding2));
+
+       /* Checks for struct hsm_user_item */
+       LASSERTF((int)sizeof(struct hsm_user_item) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_user_item));
+       LASSERTF((int)offsetof(struct hsm_user_item, hui_fid) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_item, hui_fid));
+       LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_fid) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_fid));
+       LASSERTF((int)offsetof(struct hsm_user_item, hui_extent) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_item, hui_extent));
+       LASSERTF((int)sizeof(((struct hsm_user_item *)0)->hui_extent) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_item *)0)->hui_extent));
+
+       /* Checks for struct hsm_user_state */
+       LASSERTF((int)sizeof(struct hsm_user_state) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_user_state));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_states) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_states));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_states) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_states));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_archive_num) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_archive_num));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_archive_num) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_archive_num));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_state) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_state));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_state));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_action) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_action));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_action));
+       LASSERTF((int)offsetof(struct hsm_user_state, hus_in_progress_location) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_state, hus_in_progress_location));
+       LASSERTF((int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location) == 16, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_state *)0)->hus_in_progress_location));
 }