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 HEAD
[fs/lustre-release.git]
/
lustre
/
utils
/
wiretest.c
diff --git
a/lustre/utils/wiretest.c
b/lustre/utils/wiretest.c
index
344ce94
..
3862e39
100644
(file)
--- a/
lustre/utils/wiretest.c
+++ b/
lustre/utils/wiretest.c
@@
-62,8
+62,8
@@
void lustre_assert_wire_constants(void)
{
/* Wire protocol assertions generated by 'wirecheck'
* (make -C lustre/utils newwiretest)
- * running on Linux
lin2 2.6.18-92.1.17-prep #3 Sun Nov 23 14:29:36 IST 2008 i686 i686 i386 G
- * with gcc version
3.4.6 20060404 (Red Hat 3.4.6-10
) */
+ * running on Linux
cfs21 2.6.18-92.el5xen #1 SMP Tue Jun 10 19:55:54 EDT 2008 i686 i686 i386
+ * with gcc version
4.1.2 20071124 (Red Hat 4.1.2-42
) */
/* Constants... */
@@
-163,6
+163,14
@@
void lustre_assert_wire_constants(void)
(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_LAST_OPC == 53, " found %lld\n",
(long long)MDS_LAST_OPC);
LASSERTF(REINT_SETATTR == 1, " found %lld\n",
@@
-251,9
+259,9
@@
void lustre_assert_wire_constants(void)
(long long)OBD_QC_CALLBACK);
LASSERTF(OBD_LAST_OPC == 403, " found %lld\n",
(long long)OBD_LAST_OPC);
- LASSERTF(QUOTA_DQACQ ==
9
01, " found %lld\n",
+ LASSERTF(QUOTA_DQACQ ==
6
01, " found %lld\n",
(long long)QUOTA_DQACQ);
- LASSERTF(QUOTA_DQREL ==
9
02, " found %lld\n",
+ LASSERTF(QUOTA_DQREL ==
6
02, " found %lld\n",
(long long)QUOTA_DQREL);
LASSERTF(MGS_CONNECT == 250, " found %lld\n",
(long long)MGS_CONNECT);
@@
-388,6
+396,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",
@@
-444,32
+457,34
@@
void lustre_assert_wire_constants(void)
(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));
- CLASSERT(OBD_CONNECT_RDONLY == 0x
0000000
1ULL);
- CLASSERT(OBD_CONNECT_INDEX == 0x
0000000
2ULL);
- CLASSERT(OBD_CONNECT_GRANT == 0x
0000000
8ULL);
- CLASSERT(OBD_CONNECT_SRVLOCK == 0x
000000
10ULL);
- CLASSERT(OBD_CONNECT_VERSION == 0x
000000
20ULL);
- CLASSERT(OBD_CONNECT_REQPORTAL == 0x
000000
40ULL);
- CLASSERT(OBD_CONNECT_ACL == 0x
000000
80ULL);
- CLASSERT(OBD_CONNECT_XATTR == 0x
00000
100ULL);
+ 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_REAL == 0x08000000ULL);
CLASSERT(OBD_CONNECT_CKSUM == 0x20000000ULL);
- CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x
00000
400ULL);
- CLASSERT(OBD_CONNECT_IBITS == 0x
0000
1000ULL);
- CLASSERT(OBD_CONNECT_JOIN == 0x
0000
2000ULL);
- CLASSERT(OBD_CONNECT_ATTRFID == 0x
0000
4000ULL);
- CLASSERT(OBD_CONNECT_NODEVOH == 0x
0000
8000ULL);
+ 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 == 0x00010000ULL);
CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x00020000ULL);
- CLASSERT(OBD_CONNECT_BRW_SIZE == 0x
000
40000ULL);
- CLASSERT(OBD_CONNECT_QUOTA64 == 0x
000
80000ULL);
- CLASSERT(OBD_CONNECT_MDS_CAPA == 0x
00
100000ULL);
- CLASSERT(OBD_CONNECT_OSS_CAPA == 0x
00
200000ULL);
+ 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 == 0x04000000ULL);
CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL);
CLASSERT(OBD_CONNECT_AT == 0x01000000ULL);
- CLASSERT(OBD_CONNECT_CANCELSET == 0x
00
400000ULL);
+ CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL);
CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x02000000ULL);
+ CLASSERT(OBD_CONNECT_VBR == 0x80000000ULL);
+ CLASSERT(OBD_CONNECT_SKIP_ORPHAN == 0x400000000ULL);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
@@
-637,6
+652,7
@@
void lustre_assert_wire_constants(void)
CLASSERT(OBD_FL_TRUNCLOCK == (0x00000800));
CLASSERT(OBD_FL_CKSUM_CRC32 == (0x00001000));
CLASSERT(OBD_FL_CKSUM_ADLER == (0x00002000));
+ CLASSERT(OBD_FL_SHRINK_GRANT == (0x00020000));
CLASSERT(OBD_CKSUM_CRC32 == 1);
CLASSERT(OBD_CKSUM_ADLER == 2);
@@
-2386,7
+2402,7
@@
void lustre_assert_wire_constants(void)
CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000);
/* Checks for struct ll_fiemap_extent */
- LASSERTF((int)sizeof(struct ll_fiemap_extent) ==
32
, " found %lld\n",
+ 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));
@@
-2400,28
+2416,27
@@
void lustre_assert_wire_constants(void)
(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) ==
24
, " found %lld\n",
+ 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) ==
28
, " found %lld\n",
+ 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_NO_DIRECT == 0x00000008);
- CLASSERT(FIEMAP_EXTENT_SECONDARY == 0x00000010);
- CLASSERT(FIEMAP_EXTENT_NET == 0x00000020);
- CLASSERT(FIEMAP_EXTENT_DATA_COMPRESSED == 0x00000040);
+ 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);
-#if defined(LIBLUSTRE_POSIX_ACL) && defined(CONFIG_FS_POSIX_ACL)
+ 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(xattr_acl_entry) == 8, " found %lld\n",