X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_net.c;h=2b7d5fc09bf1e4e6e48e891b82ce890815e08bd7;hb=f26cdd1c6e1d0570f2debc13b4165a0c710f6fe5;hp=76e224f11f68cb5319e166b5049dc51b7e2d019f;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index 76e224f..2b7d5fc 100644
--- a/lustre/ptlrpc/llog_net.c
+++ b/lustre/ptlrpc/llog_net.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -46,120 +46,9 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
-
 #include <obd_class.h>
 #include <lustre_log.h>
-#include <libcfs/list.h>
-#include <lvfs.h>
-
-#ifdef __KERNEL__
-int llog_origin_connect(struct llog_ctxt *ctxt, int count,
-                        struct llog_logid *logid, struct llog_gen *gen,
-                        struct obd_uuid *uuid)
-{
-        struct llog_gen_rec    *lgr;
-        struct ptlrpc_request  *req;
-        struct llogd_conn_body *req_body;
-        int                     rc;
-        ENTRY;
-
-        if (list_empty(&ctxt->loc_handle->u.chd.chd_head)) {
-                CDEBUG(D_HA, "there is no record related to ctxt %p\n", ctxt);
-                RETURN(0);
-        }
-
-        /* FIXME what value for gen->conn_cnt */
-        LLOG_GEN_INC(ctxt->loc_gen);
-
-        /* first add llog_gen_rec */
-        OBD_ALLOC_PTR(lgr);
-        if (!lgr)
-                RETURN(-ENOMEM);
-        lgr->lgr_hdr.lrh_len = lgr->lgr_tail.lrt_len = sizeof(*lgr);
-        lgr->lgr_hdr.lrh_type = LLOG_GEN_REC;
-        lgr->lgr_gen = ctxt->loc_gen;
-        rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1);
-        OBD_FREE_PTR(lgr);
-        if (rc != 1)
-                RETURN(rc);
-
-        LASSERT(ctxt->loc_imp);
-        req = ptlrpc_request_alloc_pack(ctxt->loc_imp, &RQF_LLOG_ORIGIN_CONNECT,
-                                        LUSTRE_LOG_VERSION,
-                                        LLOG_ORIGIN_CONNECT);
-        if (req == NULL)
-                RETURN(-ENOMEM);
-
-        req_body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_CONN_BODY);
-        req_body->lgdc_gen = ctxt->loc_gen;
-        req_body->lgdc_logid = ctxt->loc_handle->lgh_id;
-        req_body->lgdc_ctxt_idx = ctxt->loc_idx + 1;
-        ptlrpc_request_set_replen(req);
-
-        rc = ptlrpc_queue_wait(req);
-        ptlrpc_req_finished(req);
-
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_origin_connect);
-
-int llog_handle_connect(struct ptlrpc_request *req)
-{
-        struct obd_device *obd = req->rq_export->exp_obd;
-        struct llogd_conn_body *req_body;
-        struct llog_ctxt *ctxt;
-        int rc;
-        ENTRY;
-
-        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,
-                          &req_body->lgdc_gen, NULL);
-
-        llog_ctxt_put(ctxt);
-        if (rc != 0)
-                CERROR("failed at llog_relp_connect\n");
-
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_handle_connect);
-
-int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp)
-{
-        ENTRY;
-
-        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)
-                        class_import_put(ctxt->loc_imp);
-                ctxt->loc_imp = class_import_get(imp);
-        }
-        mutex_up(&ctxt->loc_sem);
-        RETURN(0);
-}
-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)
 {
@@ -170,13 +59,13 @@ int llog_initiator_connect(struct llog_ctxt *ctxt)
         new_imp = ctxt->loc_obd->u.cli.cl_import;
         LASSERTF(ctxt->loc_imp == NULL || ctxt->loc_imp == new_imp,
                  "%p - %p\n", ctxt->loc_imp, new_imp);
-        mutex_down(&ctxt->loc_sem);
+	mutex_lock(&ctxt->loc_mutex);
         if (ctxt->loc_imp != new_imp) {
                 if (ctxt->loc_imp)
                         class_import_put(ctxt->loc_imp);
                 ctxt->loc_imp = class_import_get(new_imp);
         }
-        mutex_up(&ctxt->loc_sem);
+	mutex_unlock(&ctxt->loc_mutex);
         RETURN(0);
 }
 EXPORT_SYMBOL(llog_initiator_connect);