X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_net.c;h=79d2f039c231379aa3c9cc6649d6f3c2024f2244;hb=7c2af3080caed79664c14d296246228509f98f45;hp=47205a5edfa6cbb594bba3a79c6e433f69d2e9a5;hpb=7bb892f4f3de837a940d867b97fe14013ad67dc6;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c index 47205a5..79d2f03 100644 --- a/lustre/ptlrpc/llog_net.c +++ b/lustre/ptlrpc/llog_net.c @@ -1,29 +1,47 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001-2003 Cluster File Systems, Inc. - * Author: Andreas Dilger + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * 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 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 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. + * 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). * - * 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. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * 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 @@ -33,27 +51,25 @@ #endif #ifdef __KERNEL__ -#include +#include #else #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #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 obd_import *imp; - struct ptlrpc_request *request; + struct llog_gen_rec *lgr; + struct ptlrpc_request *req; struct llogd_conn_body *req_body; - int size = sizeof(struct llogd_conn_body); - int rc; + int rc; ENTRY; if (list_empty(&ctxt->loc_handle->u.chd.chd_head)) { @@ -65,33 +81,32 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count, LLOG_GEN_INC(ctxt->loc_gen); /* first add llog_gen_rec */ - OBD_ALLOC(lgr, sizeof(*lgr)); + 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, NULL, NULL, NULL); - OBD_FREE(lgr, sizeof(*lgr)); + rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1); + OBD_FREE_PTR(lgr); if (rc != 1) RETURN(rc); LASSERT(ctxt->loc_imp); - imp = ctxt->loc_imp; - - request = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION, LLOG_ORIGIN_CONNECT, - 1, &size, NULL); - if (!request) + 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 = lustre_msg_buf(request->rq_reqmsg, 0, sizeof(*req_body)); + 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; - request->rq_replen = lustre_msg_size(0, NULL); + ptlrpc_request_set_replen(req); - rc = ptlrpc_queue_wait(request); - ptlrpc_req_finished(request); + rc = ptlrpc_queue_wait(req); + ptlrpc_req_finished(req); RETURN(rc); } @@ -105,12 +120,13 @@ int llog_handle_connect(struct ptlrpc_request *req) int rc; ENTRY; - req_body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*req_body)); + req_body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_CONN_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, + 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"); @@ -121,32 +137,48 @@ 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); -int llog_initiator_connect(struct llog_ctxt *ctxt) -{ - ENTRY; LASSERT(ctxt); - ctxt->loc_imp = ctxt->loc_obd->u.cli.cl_import; + mutex_down(&ctxt->loc_sem); + 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); + } + mutex_up(&ctxt->loc_sem); RETURN(0); } -EXPORT_SYMBOL(llog_initiator_connect); +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) { return 0; } +#endif int llog_initiator_connect(struct llog_ctxt *ctxt) { - return 0; + 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); + mutex_down(&ctxt->loc_sem); + 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); + RETURN(0); } -#endif +EXPORT_SYMBOL(llog_initiator_connect);