aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/lustre/lustre/include/lustre/lustre_idl.h1
-rw-r--r--drivers/staging/lustre/lustre/obdclass/lprocfs_status.c2
-rw-r--r--drivers/staging/lustre/lustre/ptlrpc/wiretest.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 6c1eb6bbef79..3a633ebf22bb 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -1193,6 +1193,7 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
1193#define OBD_CONNECT_LOCK_AHEAD 0x1000000000000000ULL /* lock ahead */ 1193#define OBD_CONNECT_LOCK_AHEAD 0x1000000000000000ULL /* lock ahead */
1194/** bulk matchbits is sent within ptlrpc_body */ 1194/** bulk matchbits is sent within ptlrpc_body */
1195#define OBD_CONNECT_BULK_MBITS 0x2000000000000000ULL 1195#define OBD_CONNECT_BULK_MBITS 0x2000000000000000ULL
1196#define OBD_CONNECT_OBDOPACK 0x4000000000000000ULL /* compact OUT obdo */
1196 1197
1197/* XXX README XXX: 1198/* XXX README XXX:
1198 * Please DO NOT add flag values here before first ensuring that this same 1199 * Please DO NOT add flag values here before first ensuring that this same
diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index 5e341e31877a..85b505edf340 100644
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -105,7 +105,7 @@ static const char * const obd_connect_names[] = {
105 "subtree", 105 "subtree",
106 "lock_ahead", 106 "lock_ahead",
107 "bulk_mbits", 107 "bulk_mbits",
108 "unknown", 108 "compact_obdo",
109 NULL 109 NULL
110}; 110};
111 111
diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
index afa79d5e7a89..04e94710f9d1 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
@@ -1109,6 +1109,8 @@ void lustre_assert_wire_constants(void)
1109 OBD_CONNECT_SUBTREE); 1109 OBD_CONNECT_SUBTREE);
1110 LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n", 1110 LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n",
1111 OBD_CONNECT_LOCK_AHEAD); 1111 OBD_CONNECT_LOCK_AHEAD);
1112 LASSERTF(OBD_CONNECT_OBDOPACK == 0x4000000000000000ULL, "found 0x%.16llxULL\n",
1113 OBD_CONNECT_OBDOPACK);
1112 LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", 1114 LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
1113 (unsigned)OBD_CKSUM_CRC32); 1115 (unsigned)OBD_CKSUM_CRC32);
1114 LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n", 1116 LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",