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
Branch b1_6
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
wiretest.c
diff --git
a/lustre/ptlrpc/wiretest.c
b/lustre/ptlrpc/wiretest.c
index
0f40241
..
a80cbec
100644
(file)
--- a/
lustre/ptlrpc/wiretest.c
+++ b/
lustre/ptlrpc/wiretest.c
@@
-12,8
+12,8
@@
void lustre_assert_wire_constants(void)
{
/* Wire protocol assertions generated by 'wirecheck'
* (make -C lustre/utils newwirecheck)
- * running on Linux
pancake 2.6.18-skas3-v9-pre9 #2 Tue Oct 17 13:08:24 PDT 2006 i686 i686 i3
- * with gcc version 3.4.
4
*/
+ * running on Linux
hideous 2.6.9-prep.qp3.5.34.4qsnet #3 Mon Aug 13 08:38:55 EEST 2007 i686
+ * with gcc version 3.4.
6 20060404 (Red Hat 3.4.6-3)
*/
/* Constants... */
@@
-35,6
+35,8
@@
void lustre_assert_wire_constants(void)
(long long)MSG_RESENT);
LASSERTF(MSG_REPLAY == 4, " found %lld\n",
(long long)MSG_REPLAY);
+ LASSERTF(MSG_AT_SUPPORT == 8, " found %lld\n",
+ (long long)MSG_AT_SUPPORT);
LASSERTF(MSG_CONNECT_RECOVERING == 1, " found %lld\n",
(long long)MSG_CONNECT_RECOVERING);
LASSERTF(MSG_CONNECT_RECONNECT == 2, " found %lld\n",
@@
-137,6
+139,8
@@
void lustre_assert_wire_constants(void)
(long long)MGS_TARGET_REG);
LASSERTF(MGS_TARGET_DEL == 254, " found %lld\n",
(long long)MGS_TARGET_DEL);
+ LASSERTF(MGS_SET_INFO == 255, " found %lld\n",
+ (long long)MGS_SET_INFO);
LASSERTF(DISP_IT_EXECD == 1, " found %lld\n",
(long long)DISP_IT_EXECD);
LASSERTF(DISP_LOOKUP_EXECD == 2, " found %lld\n",
@@
-209,6
+213,8
@@
void lustre_assert_wire_constants(void)
(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);
/* Sizes and Offsets */
/* Checks for struct obd_uuid */
@@
-298,10
+304,10
@@
void lustre_assert_wire_constants(void)
(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_
timeout
) == 16, " found %lld\n",
- (long long)(int)offsetof(struct lustre_msg_v2, lm_
timeout
));
- LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_
timeout
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_
timeout
));
+ 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_padding_1) == 20, " found %lld\n",
(long long)(int)offsetof(struct lustre_msg_v2, lm_padding_1));
LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_padding_1) == 4, " found %lld\n",
@@
-371,26
+377,22
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct ptlrpc_body, pb_conn_cnt));
LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_conn_cnt) == 4, " found %lld\n",
(long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_conn_cnt));
- LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_1) == 68, " found %lld\n",
- (long long)(int)offsetof(struct ptlrpc_body, pb_padding_1));
- LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_1) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_1));
- LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_2) == 72, " found %lld\n",
- (long long)(int)offsetof(struct ptlrpc_body, pb_padding_2));
- LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_2) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_2));
- LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_3) == 76, " found %lld\n",
- (long long)(int)offsetof(struct ptlrpc_body, pb_padding_3));
- LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_3) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_3));
- LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_4) == 80, " found %lld\n",
- (long long)(int)offsetof(struct ptlrpc_body, pb_padding_4));
- LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_4) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_4));
- LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_5) == 84, " found %lld\n",
- (long long)(int)offsetof(struct ptlrpc_body, pb_padding_5));
- LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_5) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_5));
+ LASSERTF((int)offsetof(struct ptlrpc_body, pb_timeout) == 68, " found %lld\n",
+ (long long)(int)offsetof(struct ptlrpc_body, pb_timeout));
+ LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_timeout) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_timeout));
+ LASSERTF((int)offsetof(struct ptlrpc_body, pb_service_time) == 72, " found %lld\n",
+ (long long)(int)offsetof(struct ptlrpc_body, pb_service_time));
+ LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_service_time) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_service_time));
+ LASSERTF((int)offsetof(struct ptlrpc_body, pb_slv) == 80, " found %lld\n",
+ (long long)(int)offsetof(struct ptlrpc_body, pb_slv));
+ LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_slv) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_slv));
+ LASSERTF((int)offsetof(struct ptlrpc_body, pb_limit) == 76, " found %lld\n",
+ (long long)(int)offsetof(struct ptlrpc_body, pb_limit));
+ LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_limit) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_limit));
/* Checks for struct obd_connect_data */
LASSERTF((int)sizeof(struct obd_connect_data) == 72, " found %lld\n",
@@
-462,6
+464,14
@@
void lustre_assert_wire_constants(void)
CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x20000ULL);
CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL);
CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
+ CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL);
+ CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL);
+ CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL);
+ CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL);
+ CLASSERT(OBD_CONNECT_AT == 0x01000000ULL);
+ CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x02000000ULL);
+ CLASSERT(OBD_CONNECT_MDS_MDS == 0x04000000ULL);
+ CLASSERT(OBD_CONNECT_REAL == 0x08000000ULL);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
@@
-1140,6
+1150,21
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct mds_rec_setattr, sa_attr_flags));
LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_attr_flags) == 4, " found %lld\n",
(long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_attr_flags));
+ CLASSERT(MDS_ATTR_MODE == 1);
+ CLASSERT(MDS_ATTR_UID == 2);
+ CLASSERT(MDS_ATTR_GID == 4);
+ CLASSERT(MDS_ATTR_SIZE == 8);
+ CLASSERT(MDS_ATTR_ATIME == 16);
+ CLASSERT(MDS_ATTR_MTIME == 32);
+ CLASSERT(MDS_ATTR_CTIME == 64);
+ CLASSERT(MDS_ATTR_ATIME_SET == 128);
+ CLASSERT(MDS_ATTR_MTIME_SET == 256);
+ CLASSERT(MDS_ATTR_FORCE == 512);
+ CLASSERT(MDS_ATTR_ATTR_FLAG == 1024);
+ CLASSERT(MDS_ATTR_KILL_SUID == 2048);
+ CLASSERT(MDS_ATTR_KILL_SGID == 4096);
+ CLASSERT(MDS_ATTR_CTIME_SET == 8192);
+ CLASSERT(MDS_ATTR_FROM_OPEN == 16384);
/* Checks for struct mds_rec_create */
LASSERTF((int)sizeof(struct mds_rec_create) == 96, " found %lld\n",
@@
-1468,22
+1493,18
@@
void lustre_assert_wire_constants(void)
(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_
padding
) == 4, " found %lld\n",
- (long long)(int)offsetof(struct ldlm_request, lock_
padding
));
- LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_
padding
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct ldlm_request *)0)->lock_
padding
));
+ 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_handle1) == 88, " found %lld\n",
- (long long)(int)offsetof(struct ldlm_request, lock_handle1));
- LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle1) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle1));
- LASSERTF((int)offsetof(struct ldlm_request, lock_handle2) == 96, " found %lld\n",
- (long long)(int)offsetof(struct ldlm_request, lock_handle2));
- LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle2) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle2));
+ 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",
@@
-1492,14
+1513,14
@@
void lustre_assert_wire_constants(void)
(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_re
quest
, lock_padding) == 4, " found %lld\n",
- (long long)(int)offsetof(struct ldlm_re
quest
, lock_padding));
- LASSERTF((int)sizeof(((struct ldlm_re
quest
*)0)->lock_padding) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct ldlm_re
quest
*)0)->lock_padding));
- LASSERTF((int)offsetof(struct ldlm_re
quest
, lock_desc) == 8, " found %lld\n",
- (long long)(int)offsetof(struct ldlm_re
quest
, lock_desc));
- LASSERTF((int)sizeof(((struct ldlm_re
quest
*)0)->lock_desc) == 80, " found %lld\n",
- (long long)(int)sizeof(((struct ldlm_re
quest
*)0)->lock_desc));
+ LASSERTF((int)offsetof(struct ldlm_re
ply
, lock_padding) == 4, " found %lld\n",
+ (long long)(int)offsetof(struct ldlm_re
ply
, lock_padding));
+ LASSERTF((int)sizeof(((struct ldlm_re
ply
*)0)->lock_padding) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct ldlm_re
ply
*)0)->lock_padding));
+ LASSERTF((int)offsetof(struct ldlm_re
ply
, lock_desc) == 8, " found %lld\n",
+ (long long)(int)offsetof(struct ldlm_re
ply
, lock_desc));
+ LASSERTF((int)sizeof(((struct ldlm_re
ply
*)0)->lock_desc) == 80, " found %lld\n",
+ (long long)(int)sizeof(((struct ldlm_re
ply
*)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",
@@
-2104,4
+2125,3
@@
void lustre_assert_wire_constants(void)
LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_params) == 4096, " found %lld\n",
(long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_params));
}
-