b=17661

[fs/lustre-release.git] / lustre / ptlrpc / llog_net.c

diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index cd87648..79d2f03 100644 (file)
--- a/lustre/ptlrpc/llog_net.c
+++ b/lustre/ptlrpc/llog_net.c
@@ -62,7 +62,7 @@
 #include <lvfs.h>
 
 #ifdef __KERNEL__
-int llog_origin_connect(struct llog_ctxt *ctxt, int count,
+int llog_origin_connect(struct llog_ctxt *ctxt,
                         struct llog_logid *logid, struct llog_gen *gen,
                         struct obd_uuid *uuid)
 {
@@ -123,7 +123,7 @@ int llog_handle_connect(struct ptlrpc_request *req)
         req_body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_CONN_BODY);
 
         ctxt = llog_get_context(obd, req_body->lgdc_ctxt_idx);
-        rc = llog_connect(ctxt, 1, &req_body->lgdc_logid,
+        rc = llog_connect(ctxt, &req_body->lgdc_logid,
                           &req_body->lgdc_gen, NULL);
 
         llog_ctxt_put(ctxt);
@@ -141,9 +141,11 @@ int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp)
         LASSERT(ctxt);
         mutex_down(&ctxt->loc_sem);
         if (ctxt->loc_imp != imp) {
-                CWARN("changing the import %p - %p\n", ctxt->loc_imp, imp);
-                if (ctxt->loc_imp)
+                if (ctxt->loc_imp) {
+                        CWARN("changing the import %p - %p\n",
+                              ctxt->loc_imp, imp);
                         class_import_put(ctxt->loc_imp);
+                }
                 ctxt->loc_imp = class_import_get(imp);
         }
         mutex_up(&ctxt->loc_sem);
@@ -153,7 +155,7 @@ EXPORT_SYMBOL(llog_receptor_accept);
 
 #else /* !__KERNEL__ */
 
-int llog_origin_connect(struct llog_ctxt *ctxt, int count,
+int llog_origin_connect(struct llog_ctxt *ctxt,
                         struct llog_logid *logid, struct llog_gen *gen,
                         struct obd_uuid *uuid)
 {