From: bobijam <bobijam>
Date: Tue, 8 Jul 2008 01:11:53 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: GIT_EPOCH_B_RELEASE_1_6_7~2^3~485
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2daa2297e275b226237bdf0df2c5100ba589c6ad;p=fs%2Flustre-release.git

Branch b1_6
b=15191
i=wangdi, shadow

during liblustre test during

mgc_llog_init() (lustre/mgc/libmgc.c)
  llog_initiator_connect(ctxt)

while in liblustre lib, it is defined as an empty function only return 0, while
in kernel lib, it set the context's loc_imp. And this context's loc_imp is
required after in llog_client_create().

This fix defines llog_initiator_connect() in both lib (kernel version and
liblustre version)
---

diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index 92b1418..8d955d3 100644
--- a/lustre/ptlrpc/llog_net.c
+++ b/lustre/ptlrpc/llog_net.c
@@ -159,6 +159,16 @@ int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp)
 }
 EXPORT_SYMBOL(llog_receptor_accept);
 
+#else /* !__KERNEL__ */
+
+int llog_origin_connect(struct llog_ctxt *ctxt, int count,
+                        struct llog_logid *logid, struct llog_gen *gen,
+                        struct obd_uuid *uuid)
+{
+        return 0;
+}
+#endif
+
 int llog_initiator_connect(struct llog_ctxt *ctxt)
 {
         struct obd_import *new_imp;
@@ -175,18 +185,3 @@ int llog_initiator_connect(struct llog_ctxt *ctxt)
         RETURN(0);
 }
 EXPORT_SYMBOL(llog_initiator_connect);
-
-#else /* !__KERNEL__ */
-
-int llog_origin_connect(struct llog_ctxt *ctxt, int count,
-                        struct llog_logid *logid, struct llog_gen *gen,
-                        struct obd_uuid *uuid)
-{
-        return 0;
-}
-
-int llog_initiator_connect(struct llog_ctxt *ctxt)
-{
-        return 0;
-}
-#endif