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=21563 Metadata performance has degraded for some operations between 1.6.5 and 1.8.1
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
wiretest.c
diff --git
a/lustre/ptlrpc/wiretest.c
b/lustre/ptlrpc/wiretest.c
index
5ced28f
..
20acff7
100644
(file)
--- a/
lustre/ptlrpc/wiretest.c
+++ b/
lustre/ptlrpc/wiretest.c
@@
-65,11
+65,13
@@
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
- * with gcc version 4.1.
2 20071124 (Red Hat 4.1.2-42
) */
+ * running on Linux
localhost.localdomain 2.6.18-prep #3 SMP Sun Nov 23 08:04:44 EST 2008 i68
+ * with gcc version 4.1.
1 20061011 (Red Hat 4.1.1-30
) */
/* Constants... */
+ LASSERTF(LUSTRE_MSG_MAGIC_V1 == 0x0BD00BD0," found %lld\n",
+ (long long)LUSTRE_MSG_MAGIC_V1);
LASSERTF(LUSTRE_MSG_MAGIC_V2 == 0x0BD00BD3," found %lld\n",
(long long)LUSTRE_MSG_MAGIC_V2);
LASSERTF(PTLRPC_MSG_VERSION == 0x00000003," found %lld\n",
@@
-174,9
+176,7
@@
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_GET_INFO == 53, " found %lld\n",
- (long long)MDS_GET_INFO);
- LASSERTF(MDS_LAST_OPC == 54, " found %lld\n",
+ LASSERTF(MDS_LAST_OPC == 53, " found %lld\n",
(long long)MDS_LAST_OPC);
LASSERTF(REINT_SETATTR == 1, " found %lld\n",
(long long)REINT_SETATTR);
@@
-190,6
+190,8
@@
void lustre_assert_wire_constants(void)
(long long)REINT_RENAME);
LASSERTF(REINT_OPEN == 6, " found %lld\n",
(long long)REINT_OPEN);
+ LASSERTF(REINT_SETXATTR == 7, " found %lld\n",
+ (long long)REINT_SETXATTR);
LASSERTF(REINT_MAX == 8, " found %lld\n",
(long long)REINT_MAX);
LASSERTF(MGS_CONNECT == 250, " found %lld\n",
@@
-232,9
+234,7
@@
void lustre_assert_wire_constants(void)
(long long)LDLM_CP_CALLBACK);
LASSERTF(LDLM_GL_CALLBACK == 106, " found %lld\n",
(long long)LDLM_GL_CALLBACK);
- LASSERTF(LDLM_SET_INFO == 107, " found %lld\n",
- (long long)LDLM_SET_INFO);
- LASSERTF(LDLM_LAST_OPC == 108, " found %lld\n",
+ LASSERTF(LDLM_LAST_OPC == 107, " found %lld\n",
(long long)LDLM_LAST_OPC);
LASSERTF(LCK_EX == 1, " found %lld\n",
(long long)LCK_EX);
@@
-250,9
+250,9
@@
void lustre_assert_wire_constants(void)
(long long)LCK_NL);
LASSERTF(LCK_GROUP == 64, " found %lld\n",
(long long)LCK_GROUP);
- LASSERTF(LCK_MAXMODE ==
129
, " found %lld\n",
+ LASSERTF(LCK_MAXMODE ==
65
, " found %lld\n",
(long long)LCK_MAXMODE);
- LASSERTF(LCK_MODE_NUM ==
8
, " found %lld\n",
+ LASSERTF(LCK_MODE_NUM ==
7
, " found %lld\n",
(long long)LCK_MODE_NUM);
CLASSERT(LDLM_PLAIN == 10);
CLASSERT(LDLM_EXTENT == 11);
@@
-296,6
+296,62
@@
void lustre_assert_wire_constants(void)
LASSERTF((int)sizeof(((struct lustre_handle *)0)->cookie) == 8, " found %lld\n",
(long long)(int)sizeof(((struct lustre_handle *)0)->cookie));
+ /* Checks for struct lustre_msg_v1 */
+ LASSERTF((int)sizeof(struct lustre_msg_v1) == 64, " found %lld\n",
+ (long long)(int)sizeof(struct lustre_msg_v1));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_handle) == 0, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_handle));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_handle) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_handle));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_magic) == 8, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_magic));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_magic) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_magic));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_type) == 12, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_type));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_type) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_type));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_version) == 16, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_version));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_version) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_version));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_opc) == 20, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_opc));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_opc) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_opc));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_last_xid) == 24, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_last_xid));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_last_xid) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_last_xid));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_last_committed) == 32, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_last_committed));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_last_committed) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_last_committed));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_transno) == 40, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_transno));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_transno) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_transno));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_status) == 48, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_status));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_status) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_status));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_flags) == 52, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_flags));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_flags) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_flags));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_conn_cnt) == 56, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_conn_cnt));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_conn_cnt) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_conn_cnt));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_bufcount) == 60, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_bufcount));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_bufcount) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_bufcount));
+ LASSERTF((int)offsetof(struct lustre_msg_v1, lm_buflens[0]) == 64, " found %lld\n",
+ (long long)(int)offsetof(struct lustre_msg_v1, lm_buflens[0]));
+ LASSERTF((int)sizeof(((struct lustre_msg_v1 *)0)->lm_buflens[0]) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct lustre_msg_v1 *)0)->lm_buflens[0]));
+
/* Checks for struct lustre_msg_v2 */
LASSERTF((int)sizeof(struct lustre_msg_v2) == 32, " found %lld\n",
(long long)(int)sizeof(struct lustre_msg_v2));
@@
-335,6
+391,7
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct lustre_msg_v2, lm_buflens[0]));
LASSERTF((int)sizeof(((struct lustre_msg_v2 *)0)->lm_buflens[0]) == 4, " found %lld\n",
(long long)(int)sizeof(((struct lustre_msg_v2 *)0)->lm_buflens[0]));
+ LASSERT(offsetof(struct lustre_msg_v1, lm_magic) == offsetof(struct lustre_msg_v2, lm_magic));
/* Checks for struct ptlrpc_body */
LASSERTF((int)sizeof(struct ptlrpc_body) == 152, " found %lld\n",
@@
-403,11
+460,14
@@
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]));
+ LASSERTF((int)offsetof(struct ptlrpc_body, pb_pre_versions) == 88, " found %lld\n",
+ (long long)(int)offsetof(struct ptlrpc_body, pb_pre_versions));
+ LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_pre_versions) == 32, " found %lld\n",
+ (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_pre_versions));
+ LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding) == 120, " found %lld\n",
+ (long long)(int)offsetof(struct ptlrpc_body, pb_padding));
+ LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding) == 32, " found %lld\n",
+ (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding));
/* Checks for struct obd_connect_data */
LASSERTF((int)sizeof(struct obd_connect_data) == 72, " found %lld\n",
@@
-472,9
+532,9
@@
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 == 0x8000000ULL);
- CLASSERT(OBD_CONNECT_CKSUM == 0x20000000ULL);
+ 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);
@@
-485,13
+545,15
@@
void lustre_assert_wire_constants(void)
CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL);
CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL);
- 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 == 0x2000000ULL);
+ 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);
+ CLASSERT(OBD_CONNECT_FID == 0x40000000ULL);
+ CLASSERT(OBD_CONNECT_CKSUM == 0x20000000ULL);
CLASSERT(OBD_CONNECT_VBR == 0x80000000ULL);
- CLASSERT(OBD_CONNECT_SKIP_ORPHAN == 0x400000000ULL);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
@@
-647,19
+709,20
@@
void lustre_assert_wire_constants(void)
CLASSERT(OBD_MD_FLXATTRLS == (0x0000002000000000ULL));
CLASSERT(OBD_MD_FLXATTRRM == (0x0000004000000000ULL));
CLASSERT(OBD_MD_FLACL == (0x0000008000000000ULL));
- CLASSERT(OBD_FL_INLINEDATA == 1);
- CLASSERT(OBD_FL_OBDMDEXISTS == 2);
- CLASSERT(OBD_FL_DELORPHAN == 4);
- CLASSERT(OBD_FL_NORPC == 8);
- CLASSERT(OBD_FL_IDONLY == 16);
- CLASSERT(OBD_FL_RECREATE_OBJS == 32);
- CLASSERT(OBD_FL_DEBUG_CHECK == 64);
- CLASSERT(OBD_FL_NO_USRQUOTA == 256);
- CLASSERT(OBD_FL_NO_GRPQUOTA == 512);
- CLASSERT(OBD_FL_TRUNCLOCK == 2048);
- CLASSERT(OBD_FL_CKSUM_CRC32 == 4096);
- CLASSERT(OBD_FL_CKSUM_ADLER == 8192);
- CLASSERT(OBD_FL_SHRINK_GRANT == 131072);
+ CLASSERT(OBD_FL_INLINEDATA == (0x00000001));
+ CLASSERT(OBD_FL_OBDMDEXISTS == (0x00000002));
+ CLASSERT(OBD_FL_DELORPHAN == (0x00000004));
+ CLASSERT(OBD_FL_NORPC == (0x00000008));
+ CLASSERT(OBD_FL_IDONLY == (0x00000010));
+ CLASSERT(OBD_FL_RECREATE_OBJS == (0x00000020));
+ CLASSERT(OBD_FL_DEBUG_CHECK == (0x00000040));
+ CLASSERT(OBD_FL_NO_USRQUOTA == (0x00000100));
+ CLASSERT(OBD_FL_NO_GRPQUOTA == (0x00000200));
+ CLASSERT(OBD_FL_CREATE_CROW == (0x00000400));
+ 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);
@@
-1272,7
+1335,6
@@
void lustre_assert_wire_constants(void)
CLASSERT(MDS_ATTR_KILL_SGID == 0x1000ULL);
CLASSERT(MDS_ATTR_CTIME_SET == 0x2000ULL);
CLASSERT(MDS_ATTR_FROM_OPEN == 0x4000ULL);
- CLASSERT(MDS_ATTR_BLOCKS == 0x8000ULL);
/* Checks for struct mds_rec_create */
LASSERTF((int)sizeof(struct mds_rec_create) == 96, " found %lld\n",
@@
-1967,10
+2029,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_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, 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, 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",
@@
-1980,58
+2042,6
@@
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));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_hdr) == 0, " found %lld\n",
- (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) == 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",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_tail));
-
/* Checks for struct llog_gen */
LASSERTF((int)sizeof(struct llog_gen) == 16, " found %lld\n",
(long long)(int)sizeof(struct llog_gen));
@@
-2241,6
+2251,22
@@
void lustre_assert_wire_constants(void)
LASSERTF((int)sizeof(((struct qunit_data *)0)->padding) == 8, " found %lld\n",
(long long)(int)sizeof(((struct qunit_data *)0)->padding));
+ /* Checks for struct qunit_data_old2 */
+ LASSERTF((int)sizeof(struct qunit_data_old2) == 16, " found %lld\n",
+ (long long)(int)sizeof(struct qunit_data_old2));
+ LASSERTF((int)offsetof(struct qunit_data_old2, qd_id) == 0, " found %lld\n",
+ (long long)(int)offsetof(struct qunit_data_old2, qd_id));
+ LASSERTF((int)sizeof(((struct qunit_data_old2 *)0)->qd_id) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct qunit_data_old2 *)0)->qd_id));
+ LASSERTF((int)offsetof(struct qunit_data_old2, qd_flags) == 4, " found %lld\n",
+ (long long)(int)offsetof(struct qunit_data_old2, qd_flags));
+ LASSERTF((int)sizeof(((struct qunit_data_old2 *)0)->qd_flags) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct qunit_data_old2 *)0)->qd_flags));
+ LASSERTF((int)offsetof(struct qunit_data_old2, qd_count) == 8, " found %lld\n",
+ (long long)(int)offsetof(struct qunit_data_old2, qd_count));
+ LASSERTF((int)sizeof(((struct qunit_data_old2 *)0)->qd_count) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct qunit_data_old2 *)0)->qd_count));
+
/* Checks for struct quota_adjust_qunit */
LASSERTF((int)sizeof(struct quota_adjust_qunit) == 32, " found %lld\n",
(long long)(int)sizeof(struct quota_adjust_qunit));
@@
-2260,10
+2286,6
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct quota_adjust_qunit, qaq_iunit_sz));
LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_iunit_sz) == 8, " found %lld\n",
(long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_iunit_sz));
- LASSERTF((int)offsetof(struct quota_adjust_qunit, padding1) == 24, " found %lld\n",
- (long long)(int)offsetof(struct quota_adjust_qunit, padding1));
- LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->padding1) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->padding1));
/* Checks for struct mgs_target_info */
LASSERTF((int)sizeof(struct mgs_target_info) == 4544, " found %lld\n",
@@
-2439,7
+2461,7
@@
void lustre_assert_wire_constants(void)
CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000);
CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
-#if
def LIBLUSTRE_POSIX_ACL
+#if
defined(LIBLUSTRE_POSIX_ACL) && defined(CONFIG_FS_POSIX_ACL)
/* Checks for type posix_acl_xattr_entry */
LASSERTF((int)sizeof(xattr_acl_entry) == 8, " found %lld\n",
@@
-2469,45
+2491,5
@@
void lustre_assert_wire_constants(void)
LASSERTF((int)sizeof(((xattr_acl_header *)0)->a_entries) == 0, " found %lld\n",
(long long)(int)sizeof(((xattr_acl_header *)0)->a_entries));
#endif
-
- /* Checks for struct link_ea_header */
- LASSERTF((int)sizeof(struct link_ea_header) == 24, " found %lld\n",
- (long long)(int)sizeof(struct link_ea_header));
- LASSERTF((int)offsetof(struct link_ea_header, leh_magic) == 0, " found %lld\n",
- (long long)(int)offsetof(struct link_ea_header, leh_magic));
- LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_magic) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct link_ea_header *)0)->leh_magic));
- LASSERTF((int)offsetof(struct link_ea_header, leh_reccount) == 4, " found %lld\n",
- (long long)(int)offsetof(struct link_ea_header, leh_reccount));
- LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_reccount) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct link_ea_header *)0)->leh_reccount));
- LASSERTF((int)offsetof(struct link_ea_header, leh_len) == 8, " found %lld\n",
- (long long)(int)offsetof(struct link_ea_header, leh_len));
- LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_len) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct link_ea_header *)0)->leh_len));
- LASSERTF((int)offsetof(struct link_ea_header, padding1) == 16, " found %lld\n",
- (long long)(int)offsetof(struct link_ea_header, padding1));
- LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding1) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct link_ea_header *)0)->padding1));
- LASSERTF((int)offsetof(struct link_ea_header, padding2) == 20, " found %lld\n",
- (long long)(int)offsetof(struct link_ea_header, padding2));
- LASSERTF((int)sizeof(((struct link_ea_header *)0)->padding2) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct link_ea_header *)0)->padding2));
-
- /* Checks for struct link_ea_entry */
- 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) == 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) == 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_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));
}