From: huanghua <huanghua>
Date: Fri, 11 Jul 2008 05:22:26 +0000 (+0000)
Subject: Branch b1_8_gate
X-Git-Tag: v1_7_0_51~2^25
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5b1d6bcbab7b0ec28ff09772e62335a3f3e3f288;p=fs%2Flustre-release.git

Branch b1_8_gate
b=11930
i=adilger
i=nikita.danilov
i=alex
---

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 31847ad..9e9a1a2 100644
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -834,6 +834,10 @@ struct obd_import *class_new_import(struct obd_device *obd)
         class_handle_hash(&imp->imp_handle, import_handle_addref);
         init_imp_at(&imp->imp_at);
 
+/* b1_8 supports both v1 & v2. but HEAD only supports v2.
+ * So let's use v2.
+ */
+#define HAVE_DEFAULT_V2_CONNECT 1
 #ifdef HAVE_DEFAULT_V2_CONNECT
         /* the default magic is V2, will be used in connect RPC, and
          * then adjusted according to the flags in request/reply. */