X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_net.c;h=5be7dfc38bcbdb8003b4019b7e3ad073da51db4a;hp=84d3ca68972c893e4869259fedb0e2c16f8232b6;hb=83ddd179225821e5c2aee1adb72dab26150ab385;hpb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768 diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c index 84d3ca6..5be7dfc 100644 --- a/lustre/ptlrpc/llog_net.c +++ b/lustre/ptlrpc/llog_net.c @@ -15,21 +15,18 @@ * * You should have received a copy of the GNU General Public License * 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 - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. * * lustre/ptlrpc/llog_net.c * @@ -44,157 +41,27 @@ #define DEBUG_SUBSYSTEM S_LOG -#ifdef __KERNEL__ #include -#else -#include -#endif - #include #include -#include -#include -#include - -#ifdef __KERNEL__ -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; - struct inode* inode = ctxt->loc_handle->lgh_file->f_dentry->d_inode; - void *handle; - int rc, rc1; - - ENTRY; - - 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_init(ctxt); - - /* 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; - - 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); - OBD_FREE_PTR(lgr); - 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, - LUSTRE_LOG_VERSION, - LLOG_ORIGIN_CONNECT); - 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); - - 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, &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); - cfs_mutex_lock(&ctxt->loc_mutex); - if (ctxt->loc_imp != 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); - } - cfs_mutex_unlock(&ctxt->loc_mutex); - RETURN(0); -} -EXPORT_SYMBOL(llog_receptor_accept); - -#else /* !__KERNEL__ */ - -int llog_origin_connect(struct llog_ctxt *ctxt, - 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; - ENTRY; - - LASSERT(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); - 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); - } - cfs_mutex_unlock(&ctxt->loc_mutex); - RETURN(0); + struct obd_import *new_imp; + + ENTRY; + + LASSERT(ctxt); + new_imp = ctxt->loc_obd->u.cli.cl_import; + LASSERTF(!ctxt->loc_imp || ctxt->loc_imp == new_imp, + "%p - %p\n", ctxt->loc_imp, new_imp); + 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_unlock(&ctxt->loc_mutex); + RETURN(0); } EXPORT_SYMBOL(llog_initiator_connect);