Whamcloud - gitweb
LU-2675 lov: remove unused lov llog code 39/8539/2
authorJohn L. Hammond <john.hammond@intel.com>
Wed, 11 Dec 2013 16:01:03 +0000 (10:01 -0600)
committerOleg Drokin <oleg.drokin@intel.com>
Sat, 28 Dec 2013 02:59:26 +0000 (02:59 +0000)
Remove the unused functions lov_llog_init(), lov_llog_finish(),
their supporting functions, and the file lov_log.c.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I1eaad74bbea5849cc8b28388112b6bd86b7a9781
Reviewed-on: http://review.whamcloud.com/8539
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
lustre/lov/Makefile.in
lustre/lov/autoMakefile.am
lustre/lov/lov_internal.h
lustre/lov/lov_log.c [deleted file]
lustre/lov/lov_obd.c

index 9247372..938c6d6 100644 (file)
@@ -1,5 +1,22 @@
 MODULES := lov
-lov-objs := lov_log.o lov_obd.o lov_pack.o lproc_lov.o lov_offset.o lov_merge.o lov_request.o lov_ea.o lov_dev.o lov_object.o lov_page.o lov_lock.o lov_io.o lovsub_dev.o lovsub_object.o lovsub_page.o lovsub_lock.o lovsub_io.o lov_pool.o
+lov-objs := lov_dev.o \
+       lov_ea.o \
+       lov_io.o \
+       lov_lock.o \
+       lov_merge.o \
+       lov_obd.o \
+       lov_object.o \
+       lov_offset.o \
+       lov_pack.o \
+       lov_page.o \
+       lov_pool.o \
+       lov_request.o \
+       lovsub_dev.o \
+       lovsub_io.o \
+       lovsub_lock.o \
+       lovsub_object.o \
+       lovsub_page.o \
+       lproc_lov.o
 
 EXTRA_DIST = $(lov-objs:.o=.c) lov_internal.h lov_cl_internal.h
 
index 8a73b03..7dc578e 100644 (file)
 
 if LIBLUSTRE
 noinst_LIBRARIES = liblov.a
-liblov_a_SOURCES = lov_log.c lov_pool.c lov_obd.c lov_pack.c lov_request.c lov_offset.c lov_merge.c lov_ea.c lov_internal.h lov_cl_internal.h lov_dev.c lov_object.c lov_page.c lov_lock.c lov_io.c lovsub_dev.c lovsub_object.c lovsub_page.c lovsub_lock.c lovsub_io.c
+liblov_a_SOURCES = lov_cl_internal.h \
+        lov_internal.h \
+        lov_dev.c \
+        lov_ea.c \
+        lov_io.c \
+        lov_lock.c \
+        lov_merge.c \
+        lov_obd.c \
+        lov_object.c \
+        lov_offset.c \
+        lov_pack.c \
+        lov_page.c \
+        lov_pool.c \
+        lov_request.c \
+        lovsub_dev.c \
+        lovsub_io.c \
+        lovsub_lock.c \
+        lovsub_object.c \
+        lovsub_page.c
+
 liblov_a_CPPFLAGS = $(LLCPPFLAGS)
 liblov_a_CFLAGS = $(LLCFLAGS)
 endif
@@ -52,7 +71,6 @@ if DARWIN
 macos_PROGRAMS = lov
 
 lov_SOURCES =          \
-       lov_log.c       \
        lov_pool.c      \
        lov_obd.c       \
        lov_pack.c      \
index 161b029..90644fa 100644 (file)
@@ -249,10 +249,6 @@ int lov_process_config_base(struct obd_device *obd, struct lustre_cfg *lcfg,
                             __u32 *indexp, int *genp);
 int lov_del_target(struct obd_device *obd, __u32 index,
                    struct obd_uuid *uuidp, int gen);
-/* lov_log.c */
-int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
-                  struct obd_device *tgt, int *idx);
-int lov_llog_finish(struct obd_device *obd, int count);
 
 /* lov_pack.c */
 int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmm,
diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
deleted file mode 100644 (file)
index 2308122..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * 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.
- *
- * 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
- * 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 (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/lov/lov_log.c
- *
- * Author: Phil Schwan <phil@clusterfs.com>
- * Author: Peter Braam <braam@clusterfs.com>
- * Author: Mike Shaver <shaver@clusterfs.com>
- */
-
-#define DEBUG_SUBSYSTEM S_LOV
-#ifdef __KERNEL__
-#include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
-
-#include <obd_support.h>
-#include <lustre_lib.h>
-#include <lustre_net.h>
-#include <lustre/lustre_idl.h>
-#include <lustre_dlm.h>
-#include <lustre_mds.h>
-#include <obd_class.h>
-#include <obd_lov.h>
-#include <obd_ost.h>
-#include <lprocfs_status.h>
-#include <lustre_log.h>
-
-#include "lov_internal.h"
-
-/* Add log records for each OSC that this object is striped over, and return
- * cookies for each one.  We _would_ have nice abstraction here, except that
- * we need to keep cookies in stripe order, even if some are NULL, so that
- * the right cookies are passed back to the right OSTs at the client side.
- * Unset cookies should be all-zero (which will never occur naturally). */
-static int lov_llog_origin_add(const struct lu_env *env,
-                              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 lov_obd *lov = &obd->u.lov;
-        int i, rc = 0, cookies = 0;
-        ENTRY;
-
-        LASSERTF(logcookies && numcookies >= lsm->lsm_stripe_count,
-                 "logcookies %p, numcookies %d lsm->lsm_stripe_count %d \n",
-                 logcookies, numcookies, lsm->lsm_stripe_count);
-
-        for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-                struct obd_device *child =
-                        lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd;
-                struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
-
-                /* fill mds unlink/setattr log record */
-                switch (rec->lrh_type) {
-                case MDS_UNLINK_REC: {
-                        struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec;
-                        lur->lur_oid = ostid_id(&loi->loi_oi);
-                        lur->lur_oseq = (__u32)ostid_seq(&loi->loi_oi);
-                        break;
-                }
-                case MDS_SETATTR64_REC: {
-                        struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
-                        lsr->lsr_oi = loi->loi_oi;
-                        break;
-                }
-                default:
-                        break;
-                }
-
-               /* inject error in llog_obd_add() below */
-               if (OBD_FAIL_CHECK(OBD_FAIL_MDS_FAIL_LOV_LOG_ADD)) {
-                       llog_ctxt_put(cctxt);
-                       cctxt = NULL;
-               }
-               rc = llog_obd_add(env, cctxt, rec, NULL, logcookies + cookies,
-                                 numcookies - cookies);
-                llog_ctxt_put(cctxt);
-                if (rc < 0) {
-                        CERROR("Can't add llog (rc = %d) for stripe %d\n",
-                               rc, cookies);
-                        memset(logcookies + cookies, 0,
-                               sizeof(struct llog_cookie));
-                        rc = 1; /* skip this cookie */
-                }
-               /* Note that rc is always 1 if llog_obd_add was successful */
-                cookies += rc;
-        }
-        RETURN(cookies);
-}
-
-static int lov_llog_origin_connect(struct llog_ctxt *ctxt,
-                                   struct llog_logid *logid,
-                                   struct llog_gen *gen,
-                                   struct obd_uuid *uuid)
-{
-        struct obd_device *obd = ctxt->loc_obd;
-        struct lov_obd *lov = &obd->u.lov;
-        int i, rc = 0, err = 0;
-        ENTRY;
-
-        obd_getref(obd);
-        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                struct obd_device *child;
-                struct llog_ctxt *cctxt;
-
-                if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_active)
-                        continue;
-                if (uuid && !obd_uuid_equals(uuid, &lov->lov_tgts[i]->ltd_uuid))
-                        continue;
-                CDEBUG(D_CONFIG, "connect %d/%d\n", i, lov->desc.ld_tgt_count);
-                child = lov->lov_tgts[i]->ltd_exp->exp_obd;
-                cctxt = llog_get_context(child, ctxt->loc_idx);
-                rc = llog_connect(cctxt, logid, gen, uuid);
-                llog_ctxt_put(cctxt);
-
-                if (rc) {
-                        CERROR("error osc_llog_connect tgt %d (%d)\n", i, rc);
-                        if (!err)
-                                err = rc;
-                }
-        }
-        obd_putref(obd);
-
-        RETURN(err);
-}
-
-/* the replicators commit callback */
-static int lov_llog_repl_cancel(const struct lu_env *env,
-                               struct llog_ctxt *ctxt,
-                               struct lov_stripe_md *lsm,
-                               int count, struct llog_cookie *cookies,
-                               int flags)
-{
-        struct lov_obd *lov;
-        struct obd_device *obd = ctxt->loc_obd;
-        int rc = 0, i;
-        ENTRY;
-
-        LASSERT(lsm != NULL);
-        LASSERT(count == lsm->lsm_stripe_count);
-
-        lov = &obd->u.lov;
-        obd_getref(obd);
-        for (i = 0; i < count; i++, cookies++) {
-                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-                struct obd_device *child =
-                        lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd;
-                struct llog_ctxt *cctxt =
-                        llog_get_context(child, ctxt->loc_idx);
-                int err;
-
-               err = llog_cancel(env, cctxt, NULL, 1, cookies, flags);
-               llog_ctxt_put(cctxt);
-               if (err && lov->lov_tgts[loi->loi_ost_idx]->ltd_active) {
-                       CERROR("%s: objid "DOSTID" subobj "DOSTID
-                              " on OST idx %d: rc = %d\n",
-                              obd->obd_name, POSTID(&lsm->lsm_oi),
-                              POSTID(&loi->loi_oi), loi->loi_ost_idx, err);
-                       if (!rc)
-                               rc = err;
-               }
-       }
-       obd_putref(obd);
-       RETURN(rc);
-}
-
-static struct llog_operations lov_mds_ost_orig_logops = {
-       .lop_obd_add    = lov_llog_origin_add,
-       .lop_connect    = lov_llog_origin_connect,
-};
-
-static struct llog_operations lov_size_repl_logops = {
-       .lop_cancel     = lov_llog_repl_cancel,
-};
-
-int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
-                  struct obd_device *disk_obd, int *index)
-{
-        struct lov_obd *lov = &obd->u.lov;
-        struct obd_device *child;
-        int i, rc = 0;
-        ENTRY;
-
-        LASSERT(olg == &obd->obd_olg);
-       rc = llog_setup(NULL, obd, olg, LLOG_MDS_OST_ORIG_CTXT, disk_obd,
-                       &lov_mds_ost_orig_logops);
-       if (rc)
-               RETURN(rc);
-
-       rc = llog_setup(NULL, obd, olg, LLOG_SIZE_REPL_CTXT, disk_obd,
-                       &lov_size_repl_logops);
-        if (rc)
-                GOTO(err_cleanup, rc);
-
-        obd_getref(obd);
-        /* count may not match lov->desc.ld_tgt_count during dynamic ost add */
-        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                if (!lov->lov_tgts[i])
-                        continue;
-
-                if (index && i != *index)
-                        continue;
-
-                child = lov->lov_tgts[i]->ltd_obd;
-                rc = obd_llog_init(child, &child->obd_olg, disk_obd, &i);
-                if (rc)
-                        CERROR("error osc_llog_init idx %d osc '%s' tgt '%s' "
-                               "(rc=%d)\n", i, child->obd_name,
-                               disk_obd->obd_name, rc);
-                rc = 0;
-        }
-        obd_putref(obd);
-        GOTO(err_cleanup, rc);
-err_cleanup:
-        if (rc) {
-                struct llog_ctxt *ctxt =
-                        llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
-                if (ctxt)
-                       llog_cleanup(NULL, ctxt);
-                ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT);
-                if (ctxt)
-                       llog_cleanup(NULL, ctxt);
-        }
-        return rc;
-}
-
-int lov_llog_finish(struct obd_device *obd, int count)
-{
-       struct llog_ctxt *ctxt;
-
-       ENTRY;
-
-       /* cleanup our llogs only if the ctxts have been setup
-        * (client lov doesn't setup, mds lov does). */
-       ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT);
-       if (ctxt)
-               llog_cleanup(NULL, ctxt);
-
-       ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
-       if (ctxt)
-               llog_cleanup(NULL, ctxt);
-
-       /* lov->tgt llogs are cleaned during osc_cleanup. */
-       RETURN(0);
-}
index 32e7094..101ce81 100644 (file)
@@ -63,7 +63,6 @@
 #include <cl_object.h>
 #include <lclient.h>
 #include <lustre/ll_fiemap.h>
-#include <lustre_log.h>
 #include <lustre_fid.h>
 
 #include "lov_internal.h"
@@ -874,14 +873,12 @@ static int lov_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
                                        OBD_CLEANUP_EARLY);
                 }
                 break;
-        }
-        case OBD_CLEANUP_EXPORTS:
-                rc = obd_llog_finish(obd, 0);
-                if (rc != 0)
-                        CERROR("failed to cleanup llogging subsystems\n");
-                break;
-        }
-        RETURN(rc);
+       }
+       default:
+               break;
+       }
+
+       RETURN(rc);
 }
 
 static int lov_cleanup(struct obd_device *obd)
@@ -2871,8 +2868,6 @@ struct obd_ops lov_obd_ops = {
         .o_get_info            = lov_get_info,
         .o_set_info_async      = lov_set_info_async,
         .o_extent_calc         = lov_extent_calc,
-        .o_llog_init           = lov_llog_init,
-        .o_llog_finish         = lov_llog_finish,
         .o_notify              = lov_notify,
         .o_pool_new            = lov_pool_new,
         .o_pool_rem            = lov_pool_remove,