From 27fc32ddba52ea5eaa01dbfab1d60b3d59d492d8 Mon Sep 17 00:00:00 2001
From: huanghua <huanghua>
Date: Tue, 11 Mar 2008 08:06:35 +0000
Subject: [PATCH] b=14538 - fix wrong patch in last commit according to
 Andreas's suggestion.

---
 lustre/obdclass/genops.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 8bacf405ab..88d3dd60f2 100644
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -830,9 +830,15 @@ 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);
 
+#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. */
         imp->imp_msg_magic = LUSTRE_MSG_MAGIC_V2;
+#else
+        /* the default magic is V1, will be used in connect RPC, and
+         * then adjusted according to the flags in request/reply. */
+        imp->imp_msg_magic = LUSTRE_MSG_MAGIC_V1;
+#endif
 
         return imp;
 }
-- 
GitLab