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 cd87648..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
@@ -60,25 +54,29 @@
 #include <lustre_log.h>
 #include <libcfs/list.h>
 #include <lvfs.h>
+#include <lustre_fsfilt.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)
 {
         struct llog_gen_rec    *lgr;
         struct ptlrpc_request  *req;
         struct llogd_conn_body *req_body;
-        int                     rc;
+        struct inode* inode = ctxt->loc_handle->lgh_file->f_dentry->d_inode;
+        void *handle;
+        int rc, rc1;
+
         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);
@@ -86,11 +84,24 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count,
                 RETURN(-ENOMEM);
         lgr->lgr_hdr.lrh_len = lgr->lgr_tail.lrt_len = sizeof(*lgr);
         lgr->lgr_hdr.lrh_type = LLOG_GEN_REC;
+
+        handle = fsfilt_start_log(ctxt->loc_exp->exp_obd, inode, 
+                                  FSFILT_OP_CANCEL_UNLINK, NULL, 1);
+        if (IS_ERR(handle)) {
+               CERROR("fsfilt_start failed: %ld\n", PTR_ERR(handle));
+               OBD_FREE(lgr, sizeof(*lgr));
+               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);
-        if (rc != 1)
+        rc1 = fsfilt_commit(ctxt->loc_exp->exp_obd, inode, handle, 0);
+        if (rc != 1 || rc1 != 0) {
+                rc = (rc != 1) ? rc : rc1;
                 RETURN(rc);
+        }
 
         LASSERT(ctxt->loc_imp);
         req = ptlrpc_request_alloc_pack(ctxt->loc_imp, &RQF_LLOG_ORIGIN_CONNECT,
@@ -99,12 +110,17 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count,
         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);
 
@@ -123,7 +139,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);
@@ -139,21 +155,23 @@ 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) {
-                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);
+        cfs_mutex_unlock(&ctxt->loc_mutex);
         RETURN(0);
 }
 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)
 {
@@ -170,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);