LU-1770 idl: reserve new OBD_CONNECT feature flags

Reserve protocol feature flags on b2_1 to match the definitions
on the master branch:
- OBD_CONNECT_FLOCK_OWNER
- OBD_CONNECT_LVB_TYPE
- OBD_CONNECT_NANOSEC_TIME
- OBD_CONNECT_LIGHTWEIGHT
- OBD_CONNECT_SHORTIO

The OBD_CONNECT_NANOSEC_TIME was originally added in commit
596816513b0603cb159353e1444c97d8bc3bcacf (on master it was
528feb1793e744c63c2cd137d11418c513eb92d), but this was changed
in master commit f100d508311d16a09040a057438ee06fd9e6d7fe due
to a conflict with OBD_CONNECT_FLOCK_OWNER in a customer patch.

As of the time of this patch, the nanosecond timestamp flag
is not yet in use on any branch, so changing the flag value
does not cause any protocol incompatibility.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Iae34aeec54cdfeb39fe932aa132a3cac982d1ee5
Reviewed-on: http://review.whamcloud.com/5162
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Li Wei <wei.g.li@intel.com>
Reviewed-by: Johann Lombardi <johann.lombardi@intel.com>

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index f4594ad..3ebcbfc 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -1109,9 +1109,12 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
                                                   * RPC error properly */
 #define OBD_CONNECT_GRANT_PARAM 0x100000000000ULL/* extra grant params used for
                                                   * finer space reservation */
-#define OBD_CONNECT_NANOSEC_TIME 0x200000000000ULL /* nanosecond timestamps */
-#define OBD_CONNECT_LVB_TYPE     0x400000000000ULL /* variable type of LVB */
+#define OBD_CONNECT_FLOCK_OWNER 0x200000000000ULL /* for the fixed 1.8
+                                                   * policy and 2.x server */
+#define OBD_CONNECT_LVB_TYPE    0x400000000000ULL /* variable type of LVB */
+#define OBD_CONNECT_NANOSEC_TIME 0x800000000000ULL /* nanosecond timestamps */
 #define OBD_CONNECT_LIGHTWEIGHT 0x1000000000000ULL /* lightweight connection */
+#define OBD_CONNECT_SHORTIO     0x2000000000000ULL /* short io */
 /* XXX README XXX:
  * Please DO NOT add flag values here before first ensuring that this same
  * flag value is not in use on some other branch.  Please clear any such

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 423ec69..723db26 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -823,10 +823,11 @@ static const char *obd_connect_names[] = {
         "umask",
         "einprogress",
         "grant_param",
-        "nanoseconds_times",
+        "flock_owner",
         "lvb_type",
-        "unknown",
+        "nanosecond_times",
         "lightweight_conn",
+        "short_io",
         NULL
 };
 

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index bc8f3dd..65c64ba 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -541,6 +541,11 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_CONNECT_UMASK == 0x40000000000ULL);
         CLASSERT(OBD_CONNECT_EINPROGRESS == 0x80000000000ULL);
         CLASSERT(OBD_CONNECT_GRANT_PARAM == 0x100000000000ULL);
+        CLASSERT(OBD_CONNECT_FLOCK_OWNER == 0x200000000000ULL);
+        CLASSERT(OBD_CONNECT_LVB_TYPE == 0x400000000000ULL);
+        CLASSERT(OBD_CONNECT_NANOSEC_TIME == 0x800000000000ULL);
+        CLASSERT(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL);
+        CLASSERT(OBD_CONNECT_SHORTIO == 0x2000000000000ULL);
 
         /* 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 1515a1b..e8045f8 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -246,6 +246,11 @@ static void check_obd_connect_data(void)
         CHECK_CDEFINE(OBD_CONNECT_UMASK);
         CHECK_CDEFINE(OBD_CONNECT_EINPROGRESS);
         CHECK_CDEFINE(OBD_CONNECT_GRANT_PARAM);
+        CHECK_CDEFINE(OBD_CONNECT_FLOCK_OWNER);
+        CHECK_CDEFINE(OBD_CONNECT_LVB_TYPE);
+        CHECK_CDEFINE(OBD_CONNECT_NANOSEC_TIME);
+        CHECK_CDEFINE(OBD_CONNECT_LIGHTWEIGHT);
+        CHECK_CDEFINE(OBD_CONNECT_SHORTIO);
 }
 
 static void

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 4783f43..26a7a1c 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -538,6 +538,11 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_CONNECT_UMASK == 0x40000000000ULL);
         CLASSERT(OBD_CONNECT_EINPROGRESS == 0x80000000000ULL);
         CLASSERT(OBD_CONNECT_GRANT_PARAM == 0x100000000000ULL);
+        CLASSERT(OBD_CONNECT_FLOCK_OWNER == 0x200000000000ULL);
+        CLASSERT(OBD_CONNECT_LVB_TYPE == 0x400000000000ULL);
+        CLASSERT(OBD_CONNECT_NANOSEC_TIME == 0x800000000000ULL);
+        CLASSERT(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL);
+        CLASSERT(OBD_CONNECT_SHORTIO == 0x2000000000000ULL);
 
         /* Checks for struct obdo */
         LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",