From bfea126a9cd15da89933ad00d2f3903f54acec7f Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Mon, 17 Sep 2007 17:10:34 +0000
Subject: [PATCH] Branch b1_6 Add OBD_CONNECT_MDS_MDS and OBD_CONNECT_REAL from
HEAD so we don't get any conflicts in the future.
---
lustre/ptlrpc/wiretest.c | 4 +++-
lustre/utils/wirecheck.c | 4 +++-
lustre/utils/wiretest.c | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 60faf24f40..bec68405a6 100644
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -460,12 +460,14 @@ void lustre_assert_wire_constants(void)
CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x20000ULL);
CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL);
CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
- CLASSERT(OBD_CONNECT_FID_CAPA == 0x100000ULL);
+ CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL);
CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL);
CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL);
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);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 3829894064..7c63dea53a 100644
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -175,12 +175,14 @@ static void check_obd_connect_data(void)
CHECK_CDEFINE(OBD_CONNECT_RMT_CLIENT);
CHECK_CDEFINE(OBD_CONNECT_BRW_SIZE);
CHECK_CDEFINE(OBD_CONNECT_QUOTA64);
- CHECK_CDEFINE(OBD_CONNECT_FID_CAPA);
+ CHECK_CDEFINE(OBD_CONNECT_MDS_CAPA);
CHECK_CDEFINE(OBD_CONNECT_OSS_CAPA);
CHECK_CDEFINE(OBD_CONNECT_CANCELSET);
CHECK_CDEFINE(OBD_CONNECT_SOM);
CHECK_CDEFINE(OBD_CONNECT_AT);
CHECK_CDEFINE(OBD_CONNECT_LRU_RESIZE);
+ CHECK_CDEFINE(OBD_CONNECT_MDS_MDS);
+ CHECK_CDEFINE(OBD_CONNECT_REAL);
}
static void
diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 51379ff79a..536c45d73a 100644
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -476,12 +476,14 @@ void lustre_assert_wire_constants(void)
CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x20000ULL);
CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL);
CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
- CLASSERT(OBD_CONNECT_FID_CAPA == 0x100000ULL);
+ CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL);
CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL);
CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL);
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);
/* Checks for struct obdo */
LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
--
GitLab