LU-1302 llog: pass lu_env as parametr in llog functions

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

diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index 90e071e..679f99f 100644 (file)
--- 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.
@@ -26,7 +24,7 @@
  * 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.
  */
 /*
@@ -46,10 +44,6 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
 #ifdef __KERNEL__
 #include <libcfs/libcfs.h>
 #else
@@ -76,13 +70,13 @@ int llog_origin_connect(struct llog_ctxt *ctxt,
 
         ENTRY;
 
-        if (list_empty(&ctxt->loc_handle->u.chd.chd_head)) {
+        if (cfs_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);
+        llog_gen_init(ctxt);
 
         /* first add llog_gen_rec */
         OBD_ALLOC_PTR(lgr);
@@ -99,9 +93,9 @@ int llog_origin_connect(struct llog_ctxt *ctxt,
                rc = PTR_ERR(handle);
                RETURN(rc);
         }
-        
+
         lgr->lgr_gen = ctxt->loc_gen;
-        rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1);
+       rc = llog_add(NULL, ctxt, &lgr->lgr_hdr, NULL, NULL, 1);
         OBD_FREE_PTR(lgr);
         rc1 = fsfilt_commit(ctxt->loc_exp->exp_obd, inode, handle, 0);
         if (rc != 1 || rc1 != 0) {
@@ -116,12 +110,17 @@ int llog_origin_connect(struct llog_ctxt *ctxt,
         if (req == NULL)
                 RETURN(-ENOMEM);
 
+        CDEBUG(D_OTHER, "%s mount_count "LPU64", connection count "LPU64"\n",
+               ctxt->loc_exp->exp_obd->obd_type->typ_name,
+               ctxt->loc_gen.mnt_cnt, ctxt->loc_gen.conn_cnt);
+
         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);
 
+        req->rq_no_resend = req->rq_no_delay = 1;
         rc = ptlrpc_queue_wait(req);
         ptlrpc_req_finished(req);
 
@@ -156,7 +155,7 @@ int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp)
         ENTRY;
 
         LASSERT(ctxt);
-        mutex_down(&ctxt->loc_sem);
+        cfs_mutex_lock(&ctxt->loc_mutex);
         if (ctxt->loc_imp != imp) {
                 if (ctxt->loc_imp) {
                         CWARN("changing the import %p - %p\n",
@@ -165,7 +164,7 @@ int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp)
                 }
                 ctxt->loc_imp = class_import_get(imp);
         }
-        mutex_up(&ctxt->loc_sem);
+        cfs_mutex_unlock(&ctxt->loc_mutex);
         RETURN(0);
 }
 EXPORT_SYMBOL(llog_receptor_accept);
@@ -189,13 +188,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);
+        cfs_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);
+        cfs_mutex_unlock(&ctxt->loc_mutex);
         RETURN(0);
 }
 EXPORT_SYMBOL(llog_initiator_connect);