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=10595
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
wiretest.c
diff --git
a/lustre/ptlrpc/wiretest.c
b/lustre/ptlrpc/wiretest.c
index
0f40241
..
3d3e732
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
duplo 2.6.17.3 #4 Wed Oct 18 02:46:08 MSD 2006 i686 unknown unknown GNU/L
+ * with gcc version 3.4.
6
*/
/* Constants... */
@@
-111,7
+111,7
@@
void lustre_assert_wire_constants(void)
(long long)MDS_QUOTACHECK);
LASSERTF(MDS_QUOTACTL == 48, " found %lld\n",
(long long)MDS_QUOTACTL);
- LASSERTF(MDS_LAST_OPC == 5
1
, " found %lld\n",
+ LASSERTF(MDS_LAST_OPC == 5
3
, " found %lld\n",
(long long)MDS_LAST_OPC);
LASSERTF(REINT_SETATTR == 1, " found %lld\n",
(long long)REINT_SETATTR);
@@
-427,41
+427,49
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct obd_connect_data, ocd_nllg));
LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_nllg) == 4, " found %lld\n",
(long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_nllg));
- LASSERTF((int)offsetof(struct obd_connect_data, padding1) == 40, " found %lld\n",
+ LASSERTF((int)offsetof(struct obd_connect_data, ocd_transno) == 40, " found %lld\n",
+ (long long)(int)offsetof(struct obd_connect_data, ocd_transno));
+ LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_transno) == 8, " found %lld\n",
+ (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, padding1) == 52, " found %lld\n",
(long long)(int)offsetof(struct obd_connect_data, padding1));
- LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) ==
8
, " found %lld\n",
+ LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) ==
4
, " found %lld\n",
(long long)(int)sizeof(((struct obd_connect_data *)0)->padding1));
- LASSERTF((int)offsetof(struct obd_connect_data, padding2) ==
48
, " found %lld\n",
+ LASSERTF((int)offsetof(struct obd_connect_data, padding2) ==
56
, " 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) ==
56
, " found %lld\n",
+ LASSERTF((int)offsetof(struct obd_connect_data, padding3) ==
64
, " 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) == 64, " 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)
);
- CLASSERT(OBD_CONNECT_
RDONLY == 0x1
ULL);
- CLASSERT(OBD_CONNECT_
INDEX == 0x2
ULL);
- CLASSERT(OBD_CONNECT_
GRANT == 0x8
ULL);
- CLASSERT(OBD_CONNECT_
SRVLOCK == 0x1
0ULL);
- CLASSERT(OBD_CONNECT_
VERSION == 0x2
0ULL);
- CLASSERT(OBD_CONNECT_
REQPORTAL == 0x4
0ULL);
- CLASSERT(OBD_CONNECT_
ACL == 0x8
0ULL);
- CLASSERT(OBD_CONNECT_
XATTR == 0x1
00ULL);
- CLASSERT(OBD_CONNECT_
CROW == 0x2
00ULL);
- CLASSERT(OBD_CONNECT_
TRUNCLOCK == 0x4
00ULL);
- CLASSERT(OBD_CONNECT_
TRANSNO == 0x8
00ULL);
- CLASSERT(OBD_CONNECT_
IBITS == 0x1
000ULL);
- CLASSERT(OBD_CONNECT_
JOIN == 0x2
000ULL);
- CLASSERT(OBD_CONNECT_
ATTRFID == 0x4
000ULL);
- CLASSERT(OBD_CONNECT_
NODEVOH == 0x8
000ULL);
- CLASSERT(OBD_CONNECT_
LCL_CLIENT == 0x1
0000ULL);
- CLASSERT(OBD_CONNECT_
RMT_CLIENT == 0x2
0000ULL);
- CLASSERT(OBD_CONNECT_
BRW_SIZE == 0x4
0000ULL);
- CLASSERT(OBD_CONNECT_
QUOTA64 == 0x8
0000ULL);
+ CLASSERT(OBD_CONNECT_RDONLY == 0x00000001ULL);
+
CLASSERT(OBD_CONNECT_INDEX == 0x00000002ULL
);
+ CLASSERT(OBD_CONNECT_GRANT == 0x00000008ULL);
+
CLASSERT(OBD_CONNECT_SRVLOCK == 0x00000010ULL
);
+ CLASSERT(OBD_CONNECT_
VERSION == 0x00000020
ULL);
+ CLASSERT(OBD_CONNECT_
REQPORTAL == 0x00000040
ULL);
+ CLASSERT(OBD_CONNECT_
ACL == 0x00000080
ULL);
+ CLASSERT(OBD_CONNECT_
XATTR == 0x0000010
0ULL);
+ CLASSERT(OBD_CONNECT_
REAL == 0x0000020
0ULL);
+ CLASSERT(OBD_CONNECT_
TRUNCLOCK == 0x0000040
0ULL);
+ CLASSERT(OBD_CONNECT_
IBITS == 0x0000100
0ULL);
+ CLASSERT(OBD_CONNECT_
JOIN == 0x000020
00ULL);
+ CLASSERT(OBD_CONNECT_
ATTRFID == 0x000040
00ULL);
+ CLASSERT(OBD_CONNECT_
NODEVOH == 0x000080
00ULL);
+ CLASSERT(OBD_CONNECT_
LCL_CLIENT == 0x000100
00ULL);
+ CLASSERT(OBD_CONNECT_
RMT_CLIENT == 0x00020
000ULL);
+ CLASSERT(OBD_CONNECT_
BRW_SIZE == 0x00040
000ULL);
+ CLASSERT(OBD_CONNECT_
QUOTA64 == 0x00080
000ULL);
+ CLASSERT(OBD_CONNECT_
MDS_CAPA == 0x00100
000ULL);
+ CLASSERT(OBD_CONNECT_
OSS_CAPA == 0x0020
0000ULL);
+ CLASSERT(OBD_CONNECT_
MDS_MDS == 0x0040
0000ULL);
+ CLASSERT(OBD_CONNECT_
SOM == 0x0080
0000ULL);
+ CLASSERT(OBD_CONNECT_
CANCELSET == 0x0100
0000ULL);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
@@
-605,7
+613,6
@@
void lustre_assert_wire_constants(void)
CLASSERT(OBD_FL_DEBUG_CHECK == (0x00000040));
CLASSERT(OBD_FL_NO_USRQUOTA == (0x00000100));
CLASSERT(OBD_FL_NO_GRPQUOTA == (0x00000200));
- CLASSERT(OBD_FL_CREATE_CROW == (0x00000400));
/* Checks for struct lov_mds_md_v1 */
LASSERTF((int)sizeof(struct lov_mds_md_v1) == 32, " found %lld\n",
@@
-1468,22
+1475,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
+1495,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",
@@
-1766,10
+1769,10
@@
void lustre_assert_wire_constants(void)
(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_io
_
epoch) == 32, " found %lld\n",
- (long long)(int)offsetof(struct llog_size_change_rec, lsc_io
_
epoch));
- LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_io
_
epoch) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_io
_
epoch));
+ 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, padding) == 36, " found %lld\n",
(long long)(int)offsetof(struct llog_size_change_rec, padding));
LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->padding) == 4, " found %lld\n",