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
d1f4475
..
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 l
in2 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-1
0) */
+ * running on Linux l
ocalhost.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-3
0) */
/* 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",
@@
-166,6
+168,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",
@@
-180,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",
@@
-238,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);
@@
-254,9
+266,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);
@@
-284,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));
@@
-323,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",
@@
-391,6
+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));
+ 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",
@@
-447,32
+524,36
@@
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_
REAL == 0x080000
00ULL);
- CLASSERT(OBD_CONNECT_
CKSUM == 0x200000
00ULL);
- CLASSERT(OBD_CONNECT_TR
UNCLOCK == 0x000004
00ULL);
- 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_RMT_CLIENT == 0x
000
10000ULL);
- CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x
000
20000ULL);
- 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_
MDS_MDS == 0x040
00000ULL);
+ 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 == 0x2
00ULL);
+ CLASSERT(OBD_CONNECT_
TRUNCLOCK == 0x4
00ULL);
+ CLASSERT(OBD_CONNECT_TR
ANSNO == 0x8
00ULL);
+ 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 == 0x10000ULL);
+ CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 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 == 0x4
00000ULL);
CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL);
CLASSERT(OBD_CONNECT_AT == 0x01000000ULL);
- CLASSERT(OBD_CONNECT_CANCELSET == 0x00400000ULL);
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);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
@@
-637,9
+718,11
@@
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));
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);
@@
-1024,18
+1107,6
@@
void lustre_assert_wire_constants(void)
LASSERTF((int)sizeof(((struct ll_fid *)0)->f_type) == 4, " found %lld\n",
(long long)(int)sizeof(((struct ll_fid *)0)->f_type));
- /* Checks for struct lu_fid_pack */
- LASSERTF((int)sizeof(struct lu_fid_pack) == 17, " found %lld\n",
- (long long)(int)sizeof(struct lu_fid_pack));
- LASSERTF((int)offsetof(struct lu_fid_pack, fp_len) == 0, " found %lld\n",
- (long long)(int)offsetof(struct lu_fid_pack, fp_len));
- LASSERTF((int)sizeof(((struct lu_fid_pack *)0)->fp_len) == 1, " found %lld\n",
- (long long)(int)sizeof(((struct lu_fid_pack *)0)->fp_len));
- LASSERTF((int)offsetof(struct lu_fid_pack, fp_area) == 1, " found %lld\n",
- (long long)(int)offsetof(struct lu_fid_pack, fp_area));
- LASSERTF((int)sizeof(((struct lu_fid_pack *)0)->fp_area) == 16, " found %lld\n",
- (long long)(int)sizeof(((struct lu_fid_pack *)0)->fp_area));
-
/* Checks for struct mds_status_req */
LASSERTF((int)sizeof(struct mds_status_req) == 8, " found %lld\n",
(long long)(int)sizeof(struct mds_status_req));
@@
-1264,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",
@@
-1819,10
+1889,10
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct llog_create_rec, lcr_oid));
LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oid) == 8, " found %lld\n",
(long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_oid));
- LASSERTF((int)offsetof(struct llog_create_rec, lcr_og
en
) == 40, " found %lld\n",
- (long long)(int)offsetof(struct llog_create_rec, lcr_og
en
));
- LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_og
en
));
+ LASSERTF((int)offsetof(struct llog_create_rec, lcr_og
r
) == 40, " found %lld\n",
+ (long long)(int)offsetof(struct llog_create_rec, lcr_og
r
));
+ LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_og
r
));
LASSERTF((int)offsetof(struct llog_create_rec, padding) == 44, " found %lld\n",
(long long)(int)offsetof(struct llog_create_rec, padding));
LASSERTF((int)sizeof(((struct llog_create_rec *)0)->padding) == 4, " found %lld\n",
@@
-1863,14
+1933,14
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct llog_unlink_rec, lur_oid));
LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_oid) == 8, " found %lld\n",
(long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_oid));
- LASSERTF((int)offsetof(struct llog_unlink_rec, lur_og
en
) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_unlink_rec, lur_og
en
));
- LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_og
en
));
- LASSERTF((int)offsetof(struct llog_unlink_rec,
padding
) == 28, " found %lld\n",
- (long long)(int)offsetof(struct llog_unlink_rec,
padding
));
- LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->
padding
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_unlink_rec *)0)->
padding
));
+ LASSERTF((int)offsetof(struct llog_unlink_rec, lur_og
r
) == 24, " found %lld\n",
+ (long long)(int)offsetof(struct llog_unlink_rec, lur_og
r
));
+ LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_og
r
));
+ LASSERTF((int)offsetof(struct llog_unlink_rec,
lur_count
) == 28, " found %lld\n",
+ (long long)(int)offsetof(struct llog_unlink_rec,
lur_count
));
+ LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->
lur_count
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_unlink_rec *)0)->
lur_count
));
LASSERTF((int)offsetof(struct llog_unlink_rec, lur_tail) == 32, " found %lld\n",
(long long)(int)offsetof(struct llog_unlink_rec, lur_tail));
LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_tail) == 8, " found %lld\n",
@@
-1887,10
+1957,10
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct llog_setattr_rec, lsr_oid));
LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid) == 8, " found %lld\n",
(long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid));
- LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_og
en
) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_setattr_rec, lsr_og
en
));
- LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
en
));
+ LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_og
r
) == 24, " found %lld\n",
+ (long long)(int)offsetof(struct llog_setattr_rec, lsr_og
r
));
+ LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_og
r
));
LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_uid) == 28, " found %lld\n",
(long long)(int)offsetof(struct llog_setattr_rec, lsr_uid));
LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_uid) == 4, " found %lld\n",
@@
-1919,10
+1989,10
@@
void lustre_assert_wire_constants(void)
(long long)(int)offsetof(struct llog_setattr64_rec, lsr_oid));
LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid) == 8, " found %lld\n",
(long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid));
- LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_og
en
) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_setattr64_rec, lsr_og
en
));
- LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
en
) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
en
));
+ LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_og
r
) == 24, " found %lld\n",
+ (long long)(int)offsetof(struct llog_setattr64_rec, lsr_og
r
));
+ LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
r
) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_og
r
));
LASSERTF((int)offsetof(struct llog_setattr64_rec, padding) == 28, " found %lld\n",
(long long)(int)offsetof(struct llog_setattr64_rec, padding));
LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->padding) == 4, " found %lld\n",
@@
-1959,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",
@@
-1972,50
+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 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_flags) == 16, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_flags));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_flags) == 2, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_flags));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_namelen) == 18, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_namelen));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_namelen) == 2, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_namelen));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_type) == 20, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_type));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_type) == 4, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_type));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_index) == 24, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_index));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_index) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_index));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_prev) == 32, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_prev));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_prev) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_prev));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_time) == 40, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_time));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_time) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_time));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_tfid) == 48, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_tfid));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_tfid) == 16, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_tfid));
- LASSERTF((int)offsetof(struct llog_changelog_rec, cr_pfid) == 64, " found %lld\n",
- (long long)(int)offsetof(struct llog_changelog_rec, cr_pfid));
- LASSERTF((int)sizeof(((struct llog_changelog_rec *)0)->cr_pfid) == 16, " found %lld\n",
- (long long)(int)sizeof(((struct llog_changelog_rec *)0)->cr_pfid));
- 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));
@@
-2225,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));
@@
-2244,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",
@@
-2389,7
+2427,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));
@@
-2403,28
+2441,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);
-#ifdef LIBLUSTRE_POSIX_ACL
+ CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
+ CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
+#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",
@@
-2454,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) == 19, " found %lld\n",
- (long long)(int)sizeof(struct link_ea_entry));
- LASSERTF((int)offsetof(struct link_ea_entry, lee_reclen) == 0, " 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) == 2, " 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) == 17, " found %lld\n",
- (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
- LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 19, " 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));
}