Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
b=20030
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
wiretest.c
diff --git
a/lustre/ptlrpc/wiretest.c
b/lustre/ptlrpc/wiretest.c
index
c04abbe
..
790f861
100644
(file)
--- a/
lustre/ptlrpc/wiretest.c
+++ b/
lustre/ptlrpc/wiretest.c
@@
-65,7
+65,7
@@
void lustre_assert_wire_constants(void)
{
/* Wire protocol assertions generated by 'wirecheck'
* (make -C lustre/utils newwiretest)
- * running on Linux
cfs21 2.6.18-92.el5xen #1 SMP Tue Jun 10 19:55:54 EDT 2008 i686 i686 i386
+ * running on Linux
lin3 2.6.18-128.1.1-prep #1 SMP Wed Mar 4 23:08:37 MST 2009 i686 i686 i38
* with gcc version 4.1.2 20071124 (Red Hat 4.1.2-42) */
@@
-174,7
+174,9
@@
void lustre_assert_wire_constants(void)
(long long)MDS_WRITEPAGE);
LASSERTF(MDS_IS_SUBDIR == 52, " found %lld\n",
(long long)MDS_IS_SUBDIR);
- LASSERTF(MDS_LAST_OPC == 53, " found %lld\n",
+ LASSERTF(MDS_GET_INFO == 53, " found %lld\n",
+ (long long)MDS_GET_INFO);
+ LASSERTF(MDS_LAST_OPC == 54, " found %lld\n",
(long long)MDS_LAST_OPC);
LASSERTF(REINT_SETATTR == 1, " found %lld\n",
(long long)REINT_SETATTR);
@@
-399,6
+401,11
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct ptlrpc_body, pb_limit));
LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_limit) == 4, " found %lld\n",
(long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_limit));
+ CLASSERT(PTLRPC_NUM_VERSIONS == 4);
+ LASSERTF((int)offsetof(struct ptlrpc_body, pb_pre_versions[4]) == 120, " found %lld\n",
+ (long long)(int)offsetof(struct ptlrpc_body, pb_pre_versions[4]));
+ LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_pre_versions[4]) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_pre_versions[4]));
/* Checks for struct obd_connect_data */
LASSERTF((int)sizeof(struct obd_connect_data) == 72, " found %lld\n",
@@
-463,24
+470,25
@@
void lustre_assert_wire_constants(void)
CLASSERT(OBD_CONNECT_REQPORTAL == 0x40ULL);
CLASSERT(OBD_CONNECT_ACL == 0x80ULL);
CLASSERT(OBD_CONNECT_XATTR == 0x100ULL);
- CLASSERT(OBD_CONNECT_REAL == 0x
0
8000000ULL);
+ CLASSERT(OBD_CONNECT_REAL == 0x8000000ULL);
CLASSERT(OBD_CONNECT_CKSUM == 0x20000000ULL);
CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x400ULL);
CLASSERT(OBD_CONNECT_IBITS == 0x1000ULL);
CLASSERT(OBD_CONNECT_JOIN == 0x2000ULL);
CLASSERT(OBD_CONNECT_ATTRFID == 0x4000ULL);
CLASSERT(OBD_CONNECT_NODEVOH == 0x8000ULL);
- CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x
000
10000ULL);
- CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x
000
20000ULL);
+ CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x10000ULL);
+ CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x20000ULL);
CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL);
CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL);
CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL);
- CLASSERT(OBD_CONNECT_MDS_MDS == 0x
0
4000000ULL);
- CLASSERT(OBD_CONNECT_SOM == 0x
00
800000ULL);
- CLASSERT(OBD_CONNECT_AT == 0x
0
1000000ULL);
+ CLASSERT(OBD_CONNECT_MDS_MDS == 0x4000000ULL);
+ CLASSERT(OBD_CONNECT_SOM == 0x800000ULL);
+ CLASSERT(OBD_CONNECT_AT == 0x1000000ULL);
CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL);
- CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x02000000ULL);
+ CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x2000000ULL);
+ CLASSERT(OBD_CONNECT_VBR == 0x80000000ULL);
CLASSERT(OBD_CONNECT_SKIP_ORPHAN == 0x400000000ULL);
/* Checks for struct obdo */
@@
-1034,18
+1042,6
@@
void lustre_assert_wire_constants(void)
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 lu_fid_pack */
- LASSERTF((int)sizeof(struct lu_fid_pack) == 17, " found %lld\n",
- (long long)(int)sizeof(struct lu_fid_pack));
- LASSERTF((int)offsetof(struct lu_fid_pack, fp_len) == 0, " found %lld\n",
- (long long)(int)offsetof(struct lu_fid_pack, fp_len));
- LASSERTF((int)sizeof(((struct lu_fid_pack *)0)->fp_len) == 1, " found %lld\n",
- (long long)(int)sizeof(((struct lu_fid_pack *)0)->fp_len));
- LASSERTF((int)offsetof(struct lu_fid_pack, fp_area) == 1, " found %lld\n",
- (long long)(int)offsetof(struct lu_fid_pack, fp_area));
- LASSERTF((int)sizeof(((struct lu_fid_pack *)0)->fp_area) == 16, " found %lld\n",
- (long long)(int)sizeof(((struct lu_fid_pack *)0)->fp_area));
-
/* Checks for struct mds_status_req */
LASSERTF((int)sizeof(struct mds_status_req) == 8, " found %lld\n",
(long long)(int)sizeof(struct mds_status_req));
@@
-1829,10
+1825,10
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct llog_create_rec, lcr_oid));
LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oid) == 8, " found %lld\n",
(long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_oid));
- LASSERTF((int)offsetof(struct llog_create_rec, lcr_og
en
) == 40, " found %lld\n",
- (long long)(int)offsetof(struct llog_create_rec, lcr_og
en
));
- LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_og
en
));
+ LASSERTF((int)offsetof(struct llog_create_rec, lcr_og
r
) == 40, " found %lld\n",
+ (long long)(int)offsetof(struct llog_create_rec, lcr_og
r
));
+ LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_og
r
));
LASSERTF((int)offsetof(struct llog_create_rec, padding) == 44, " found %lld\n",
(long long)(int)offsetof(struct llog_create_rec, padding));
LASSERTF((int)sizeof(((struct llog_create_rec *)0)->padding) == 4, " found %lld\n",
@@
-1873,14
+1869,14
@@
void lustre_assert_wire_constants(void)
(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_og
en
) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_unlink_rec, lur_og
en
));
- LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_og
en
));
- LASSERTF((int)offsetof(struct llog_unlink_rec,
padding
) == 28, " found %lld\n",
- (long long)(int)offsetof(struct llog_unlink_rec,
padding
));
- LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->
padding
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_unlink_rec *)0)->
padding
));
+ LASSERTF((int)offsetof(struct llog_unlink_rec, lur_og
r
) == 24, " found %lld\n",
+ (long long)(int)offsetof(struct llog_unlink_rec, lur_og
r
));
+ LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_og
r
));
+ 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",
@@
-1897,10
+1893,10
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct llog_setattr_rec, lsr_oid));
LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid) == 8, " found %lld\n",
(long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid));
- LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_og
en
) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_setattr_rec, lsr_og
en
));
- LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
en
));
+ LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_og
r
) == 24, " found %lld\n",
+ (long long)(int)offsetof(struct llog_setattr_rec, lsr_og
r
));
+ LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
r
));
LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_uid) == 28, " found %lld\n",
(long long)(int)offsetof(struct llog_setattr_rec, lsr_uid));
LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_uid) == 4, " found %lld\n",
@@
-1929,10
+1925,10
@@
void lustre_assert_wire_constants(void)
(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_og
en
) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_setattr64_rec, lsr_og
en
));
- LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
en
));
+ LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_og
r
) == 24, " found %lld\n",
+ (long long)(int)offsetof(struct llog_setattr64_rec, lsr_og
r
));
+ LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
r
));
LASSERTF((int)offsetof(struct llog_setattr64_rec, padding) == 28, " found %lld\n",
(long long)(int)offsetof(struct llog_setattr64_rec, padding));
LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->padding) == 4, " found %lld\n",
@@
-1982,6
+1978,42
@@
void lustre_assert_wire_constants(void)
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 llog_changelog_rec */
LASSERTF((int)sizeof(struct llog_changelog_rec) == 88, " found %lld\n",
(long long)(int)sizeof(struct llog_changelog_rec));
@@
-1989,38
+2021,10
@@
void lustre_assert_wire_constants(void)
(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_flags) == 16, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_flags));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_flags) == 2, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_flags));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_namelen) == 18, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_namelen));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_namelen) == 2, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_namelen));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_type) == 20, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_type));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_type) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_type));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_index) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_index));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_index) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_index));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_prev) == 32, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_prev));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_prev) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_prev));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_time) == 40, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_time));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_time) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_time));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_tfid) == 48, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_tfid));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_tfid) == 16, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_tfid));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_pfid) == 64, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_pfid));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_pfid) == 16, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_pfid));
+ 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",
@@
-2489,19
+2493,18
@@
void lustre_assert_wire_constants(void)
(long long)(int)sizeof(((struct link_ea_header *)0)->padding2));
/* Checks for struct link_ea_entry */
- LASSERTF((int)sizeof(struct link_ea_entry) ==
19
, " found %lld\n",
+ LASSERTF((int)sizeof(struct link_ea_entry) ==
20
, " found %lld\n",
(long long)(int)sizeof(struct link_ea_entry));
- LASSERTF((int)offsetof(struct link_ea_entry, lee_reclen) == 0, " found %lld\n",
+ LASSERTF((int)offsetof(struct link_ea_entry, lee_parent_fid) == 0, " 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_reclen) == 16, " 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) == 17, " found %lld\n",
- (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
- LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 19, " found %lld\n",
+ LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 20, " 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));
}
-