X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmds%2Fmds_log.c;h=93d48a635de6eb61446a8608c8d28f4e2bb2646a;hb=87319353501f4520284186e9e8bdb57695f90feb;hp=8b9596936bf24d993a322b94427b9b02549f38e4;hpb=ac606470fe01743b1af98b29c07cadbd792c9614;p=fs%2Flustre-release.git diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c index 8b95969..93d48a6 100644 --- a/lustre/mds/mds_log.c +++ b/lustre/mds/mds_log.c @@ -8,131 +8,92 @@ * Author: Andreas Dilger * Author: Phil Schwan * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * 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. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * 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. + * If you did not agree to a different license, then this copy of Lustre + * is open source 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. * - * 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. + * In either case, 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 + * license text for more details. */ #define DEBUG_SUBSYSTEM S_MDS +#ifndef AUTOCONF_INCLUDED #include +#endif #include #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, - void *buf, struct llog_cookie *logcookies, - int numcookies, void *data, - struct rw_semaphore **lock, int *lock_count) +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_lov_obd; + struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; struct llog_ctxt *lctxt; int rc; ENTRY; - lctxt = llog_get_context(&lov_obd->obd_llogs, ctxt->loc_idx); - rc = llog_add(lctxt, rec, buf, logcookies, numcookies, data, - lock, lock_count); + 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, struct llog_logid *logid, - struct llog_gen *gen, struct obd_uuid *uuid) + struct llog_gen *gen, + struct obd_uuid *uuid) { struct obd_device *obd = ctxt->loc_obd; - struct obd_device *lov_obd = obd->u.mds.mds_lov_obd; + struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; struct llog_ctxt *lctxt; int rc; ENTRY; - lctxt = llog_get_context(&lov_obd->obd_llogs, ctxt->loc_idx); + lctxt = llog_get_context(lov_obd, ctxt->loc_idx); rc = llog_connect(lctxt, count, logid, gen, uuid); + llog_ctxt_put(lctxt); RETURN(rc); } -static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, int count, - struct llog_cookie *cookies, int flags, - void *data) +static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, + int count, struct llog_cookie *cookies, int flags) { struct obd_device *obd = ctxt->loc_obd; - struct obd_device *lov_obd = obd->u.mds.mds_lov_obd; + struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; struct llog_ctxt *lctxt; int rc; ENTRY; - lctxt = llog_get_context(&lov_obd->obd_llogs, ctxt->loc_idx); - rc = llog_cancel(lctxt, count, cookies, flags, data); + lctxt = llog_get_context(lov_obd, ctxt->loc_idx); + rc = llog_cancel(lctxt, lsm, count, cookies, flags); + llog_ctxt_put(lctxt); 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 llog_create_locks **res) -{ - struct mds_obd *mds = &obd->u.mds; - struct lov_stripe_md *lsm = NULL; - struct llog_ctxt *ctxt; - struct llog_create_locks *lcl = NULL; - int rc, size = 0,offset = offsetof(struct llog_create_locks, lcl_locks); - int lock_count = 0; - ENTRY; - - if (IS_ERR(mds->mds_lov_obd)) - RETURN(PTR_ERR(mds->mds_lov_obd)); - - RETURN(0); - - rc = obd_unpackmd(mds->mds_lov_exp, &lsm, lmm, lmm_size); - if (rc < 0) - RETURN(rc); - - if (res != NULL) { - size = offset + - sizeof(struct rw_semaphore *) * lsm->lsm_stripe_count; - OBD_ALLOC(lcl, size); - if (lcl == NULL) - RETURN(-ENOMEM); - - lcl->lcl_count = lsm->lsm_stripe_count; - *res = lcl; - } - - ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT); - rc = llog_add(ctxt, NULL, lsm, logcookies, - cookies_size / sizeof(struct llog_cookie), NULL, - res ? &lcl->lcl_locks[0] : NULL, &lock_count); - - obd_free_memmd(mds->mds_lov_exp, &lsm); - - if (res && (rc <= 0 || lock_count == 0)) { - OBD_FREE(lcl, size); - *res = NULL; - } - - 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, }; @@ -141,47 +102,47 @@ static struct llog_operations mds_size_repl_logops = { lop_cancel: mds_llog_repl_cancel, }; -int mds_llog_init(struct obd_device *obd, struct obd_llogs *llogs, - struct obd_device *tgt, int count, struct llog_catid *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_lov_obd; + struct obd_device *lov_obd = obd->u.mds.mds_osc_obd; int rc; ENTRY; - rc = obd_llog_setup(obd, llogs, 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 = obd_llog_setup(obd, llogs, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL, - &mds_size_repl_logops); + rc = llog_setup(obd, &obd->obd_olg, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL, + &mds_size_repl_logops); if (rc) RETURN(rc); - rc = obd_llog_init(lov_obd, &lov_obd->obd_llogs, tgt, count, logid); + rc = obd_llog_init(lov_obd, &lov_obd->obd_olg, tgt, count, logid, uuid); if (rc) - CERROR("error lov_llog_init\n"); + CERROR("lov_llog_init err %d\n", rc); RETURN(rc); } -int mds_llog_finish(struct obd_device *obd, struct obd_llogs *llogs, int count) +int mds_llog_finish(struct obd_device *obd, int count) { - struct obd_device *lov_obd = obd->u.mds.mds_lov_obd; - int rc; + struct llog_ctxt *ctxt; + int rc = 0, rc2 = 0; ENTRY; - rc = obd_llog_cleanup(llog_get_context(llogs, LLOG_UNLINK_ORIG_CTXT)); - if (rc) - RETURN(rc); - - rc = obd_llog_cleanup(llog_get_context(llogs, 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, &lov_obd->obd_llogs, 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); }