X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_net.c;h=9036491a1a89a536bcf06e4f9afc849fbf190026;hp=38810a3150a3f19dcd59529d840b7d7e00fb301d;hb=3cce65712d94cffe8f1626545845b95b88aef672;hpb=090c677210ee2946d99c71412e4ff762bb300f4f diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c index 38810a3..9036491 100644 --- a/lustre/ptlrpc/llog_net.c +++ b/lustre/ptlrpc/llog_net.c @@ -1,152 +1,67 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2001-2003 Cluster File Systems, Inc. - * Author: Andreas Dilger + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.gnu.org/licenses/gpl-2.0.html * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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 * * OST<->MDS recovery logging infrastructure. * * Invariants in implementation: * - we do not share logs among different OST<->MDS connections, so that * if an OST or MDS fails it need only look at log(s) relevant to itself + * + * Author: Andreas Dilger */ #define DEBUG_SUBSYSTEM S_LOG -#ifndef EXPORT_SYMTAB -#define EXPORT_SYMTAB -#endif - -#ifdef __KERNEL__ -#include -#else -#include -#endif - -#include -#include -#include -#include - -#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 obd_import *imp; - struct ptlrpc_request *request; - struct llogd_conn_body *req_body; - int size = sizeof(struct llogd_conn_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(lgr, sizeof(*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(lgr, sizeof(*lgr)); - if (rc != 1) - RETURN(rc); - - LASSERT(ctxt->loc_imp); - imp = ctxt->loc_imp; - - request = ptlrpc_prep_req(imp, LLOG_ORIGIN_CONNECT, 1, &size, NULL); - if (!request) - RETURN(-ENOMEM); - - req_body = lustre_msg_buf(request->rq_reqmsg, 0, sizeof(*req_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; - request->rq_replen = lustre_msg_size(0, NULL); - - rc = ptlrpc_queue_wait(request); - ptlrpc_req_finished(request); - - 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 = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*req_body)); - -#warning "FIXME: shouldn't llogs be passed directly?" - ctxt = llog_get_context(&obd->obd_llogs, req_body->lgdc_ctxt_idx); - rc = llog_connect(ctxt, 1, &req_body->lgdc_logid, - &req_body->lgdc_gen, NULL); - 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); - ctxt->loc_imp = imp; - RETURN(0); -} -EXPORT_SYMBOL(llog_receptor_accept); +#include +#include +#include int llog_initiator_connect(struct llog_ctxt *ctxt) { + struct obd_import *new_imp; ENTRY; + LASSERT(ctxt); - ctxt->loc_imp = ctxt->loc_obd->u.cli.cl_import; + 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_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); - -#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; -} - -int llog_initiator_connect(struct llog_ctxt *ctxt) -{ - return 0; -} -#endif