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
- make HEAD from b_post_cmd3
[fs/lustre-release.git]
/
lustre
/
utils
/
wiretest.c
diff --git
a/lustre/utils/wiretest.c
b/lustre/utils/wiretest.c
index
5d6d250
..
45b5c95
100644
(file)
--- a/
lustre/utils/wiretest.c
+++ b/
lustre/utils/wiretest.c
@@
-28,8
+28,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... */
@@
-127,7
+127,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);
@@
-443,41
+443,48
@@
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 == 0x1ULL);
- CLASSERT(OBD_CONNECT_INDEX == 0x2ULL);
- CLASSERT(OBD_CONNECT_GRANT == 0x8ULL);
- CLASSERT(OBD_CONNECT_SRVLOCK == 0x10ULL);
- CLASSERT(OBD_CONNECT_VERSION == 0x20ULL);
- CLASSERT(OBD_CONNECT_REQPORTAL == 0x40ULL);
- CLASSERT(OBD_CONNECT_ACL == 0x80ULL);
- CLASSERT(OBD_CONNECT_XATTR == 0x100ULL);
- CLASSERT(OBD_CONNECT_CROW == 0x200ULL);
- CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x400ULL);
- CLASSERT(OBD_CONNECT_TRANSNO == 0x800ULL);
- CLASSERT(OBD_CONNECT_IBITS == 0x1000ULL);
- CLASSERT(OBD_CONNECT_JOIN == 0x2000ULL);
- CLASSERT(OBD_CONNECT_ATTRFID == 0x4000ULL);
- CLASSERT(OBD_CONNECT_NODEVOH == 0x8000ULL);
- CLASSERT(OBD_CONNECT_LCL_CLIENT == 0x10000ULL);
- CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x20000ULL);
- CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL);
- CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
+ CLASSERT(OBD_CONNECT_RDONLY == 0x00000001ULL);
+ CLASSERT(OBD_CONNECT_INDEX == 0x00000002ULL);
+ CLASSERT(OBD_CONNECT_GRANT == 0x00000008ULL);
+ CLASSERT(OBD_CONNECT_SRVLOCK == 0x00000010ULL);
+ CLASSERT(OBD_CONNECT_VERSION == 0x00000020ULL);
+ CLASSERT(OBD_CONNECT_REQPORTAL == 0x00000040ULL);
+ CLASSERT(OBD_CONNECT_ACL == 0x00000080ULL);
+ CLASSERT(OBD_CONNECT_XATTR == 0x00000100ULL);
+ CLASSERT(OBD_CONNECT_REAL == 0x00000200ULL);
+ CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x00000400ULL);
+ CLASSERT(OBD_CONNECT_IBITS == 0x00001000ULL);
+ CLASSERT(OBD_CONNECT_JOIN == 0x00002000ULL);
+ CLASSERT(OBD_CONNECT_ATTRFID == 0x00004000ULL);
+ CLASSERT(OBD_CONNECT_NODEVOH == 0x00008000ULL);
+ CLASSERT(OBD_CONNECT_LCL_CLIENT == 0x00010000ULL);
+ CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x00020000ULL);
+ CLASSERT(OBD_CONNECT_BRW_SIZE == 0x00040000ULL);
+ CLASSERT(OBD_CONNECT_QUOTA64 == 0x00080000ULL);
+ CLASSERT(OBD_CONNECT_MDS_CAPA == 0x00100000ULL);
+ CLASSERT(OBD_CONNECT_OSS_CAPA == 0x00200000ULL);
+ CLASSERT(OBD_CONNECT_MDS_MDS == 0x00400000ULL);
+ CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
@@
-621,7
+628,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",
@@
-1782,10
+1788,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",