X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmds%2Fmds_log.c;h=b582ae1f3f111398e3aff41a199d135cd473efdc;hb=b204a58e4017612e9cc6572c4de49d216a9ab061;hp=c4d56901d4d53f651854f9546fb584a916f02839;hpb=e0576be940d7af30b2ba6e219891a4413670325d;p=fs%2Flustre-release.git diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c index c4d5690..b582ae1 100644 --- a/lustre/mds/mds_log.c +++ b/lustre/mds/mds_log.c @@ -1,45 +1,63 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * lustre/mds/mds_log.c + * GPL HEADER START * - * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Author: Peter Braam - * Author: Andreas Dilger - * Author: Phil Schwan + * 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.sun.com/software/products/lustre/docs/GPLv2.pdf * - * 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. + * 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/mds/mds_log.c + * + * Author: Peter Braam + * Author: Andreas Dilger + * Author: Phil Schwan */ #define DEBUG_SUBSYSTEM S_MDS +#ifndef AUTOCONF_INCLUDED #include +#endif #include #include -#include -#include -#include -#include - +#include +#include +#include +#include +#include #include "mds_internal.h" -static int mds_llog_origin_add(struct llog_ctxt *ctxt, - struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, - struct llog_cookie *logcookies, int numcookies) +static int mds_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, + struct lov_stripe_md *lsm, + struct llog_cookie *logcookies, int numcookies) { struct obd_device *obd = ctxt->loc_obd; struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; @@ -49,12 +67,15 @@ static int mds_llog_origin_add(struct llog_ctxt *ctxt, lctxt = llog_get_context(lov_obd, ctxt->loc_idx); rc = llog_add(lctxt, rec, lsm, logcookies, numcookies); + llog_ctxt_put(lctxt); + RETURN(rc); } -static int mds_llog_origin_connect(struct llog_ctxt *ctxt, int count, +static int mds_llog_origin_connect(struct llog_ctxt *ctxt, struct llog_logid *logid, - struct llog_gen *gen) + struct llog_gen *gen, + struct obd_uuid *uuid) { struct obd_device *obd = ctxt->loc_obd; struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; @@ -63,7 +84,8 @@ static int mds_llog_origin_connect(struct llog_ctxt *ctxt, int count, ENTRY; lctxt = llog_get_context(lov_obd, ctxt->loc_idx); - rc = llog_connect(lctxt, count, logid, gen); + rc = llog_connect(lctxt, logid, gen, uuid); + llog_ctxt_put(lctxt); RETURN(rc); } @@ -77,87 +99,73 @@ static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *ls ENTRY; lctxt = llog_get_context(lov_obd, ctxt->loc_idx); - rc = llog_cancel(lctxt, lsm, count, cookies,flags); - RETURN(rc); -} - -int mds_log_op_unlink(struct obd_device *obd, struct inode *inode, - struct lov_mds_md *lmm, int lmm_size, - struct llog_cookie *logcookies, int cookies_size) -{ - struct mds_obd *mds = &obd->u.mds; - struct lov_stripe_md *lsm = NULL; - struct llog_ctxt *ctxt; - int rc; - ENTRY; - - if (IS_ERR(mds->mds_osc_obd)) - RETURN(PTR_ERR(mds->mds_osc_obd)); - - rc = obd_unpackmd(mds->mds_osc_exp, &lsm, - lmm, lmm_size); - if (rc < 0) - RETURN(rc); - - ctxt = llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT); - rc = llog_add(ctxt, NULL, lsm, logcookies, - cookies_size / sizeof(struct llog_cookie)); - - obd_free_memmd(mds->mds_osc_exp, &lsm); - + rc = llog_cancel(lctxt, lsm, count, cookies, flags); + llog_ctxt_put(lctxt); RETURN(rc); } -static struct llog_operations mds_unlink_orig_logops = { +static struct llog_operations mds_ost_orig_logops = { lop_add: mds_llog_origin_add, lop_connect: mds_llog_origin_connect, }; static struct llog_operations mds_size_repl_logops = { - lop_cancel: mds_llog_repl_cancel + lop_cancel: mds_llog_repl_cancel, }; -int mds_llog_init(struct obd_device *obd, struct obd_device *tgt, - int count, struct llog_logid *logid) +int mds_llog_init(struct obd_device *obd, struct obd_llog_group *olg, + struct obd_device *tgt, int count, struct llog_catid *logid, + struct obd_uuid *uuid) { struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; + struct llog_ctxt *ctxt; int rc; ENTRY; - rc = llog_setup(obd, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL, - &mds_unlink_orig_logops); + LASSERT(olg == &obd->obd_olg); + rc = llog_setup(obd, &obd->obd_olg, LLOG_MDS_OST_ORIG_CTXT, tgt, 0, NULL, + &mds_ost_orig_logops); if (rc) RETURN(rc); - rc = llog_setup(obd, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL, + rc = llog_setup(obd, &obd->obd_olg, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL, &mds_size_repl_logops); if (rc) - RETURN(rc); + GOTO(err_llog, rc); - rc = obd_llog_init(lov_obd, tgt, count, logid); - if (rc) - CERROR("error lov_llog_init\n"); + rc = obd_llog_init(lov_obd, &lov_obd->obd_olg, tgt, count, logid, uuid); + if (rc) { + CERROR("lov_llog_init err %d\n", rc); + GOTO(err_cleanup, rc); + } RETURN(rc); +err_cleanup: + ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT); + if (ctxt) + llog_cleanup(ctxt); +err_llog: + ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT); + if (ctxt) + llog_cleanup(ctxt); + return rc; } int mds_llog_finish(struct obd_device *obd, int count) { - struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; - int rc; + struct llog_ctxt *ctxt; + int rc = 0, rc2 = 0; ENTRY; - rc = llog_cleanup(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT)); - if (rc) - RETURN(rc); - - rc = llog_cleanup(llog_get_context(obd, LLOG_SIZE_REPL_CTXT)); - if (rc) - RETURN(rc); + ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT); + if (ctxt) + rc = llog_cleanup(ctxt); - rc = obd_llog_finish(lov_obd, count); - if (rc) - CERROR("error lov_llog_finish\n"); + ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT); + if (ctxt) + rc2 = llog_cleanup(ctxt); + if (!rc) + rc = rc2; RETURN(rc); }