struct llog_ctxt *ctxt = NULL;
struct lu_env env;
struct lu_target *lut;
- struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
- struct lod_tgt_desc *tgt = NULL;
+ struct lu_tgt_desc *mdt = NULL;
time64_t start;
int retries = 0;
int rc;
GOTO(out, rc = 0);
}
- ltd_foreach_tgt(ltd, tgt) {
- if (!tgt->ltd_got_update_log) {
+ lod_foreach_mdt(lod, mdt) {
+ if (!mdt->ltd_got_update_log) {
spin_unlock(&lod->lod_lock);
GOTO(out, rc = 0);
}
thread = &lod->lod_child_recovery_thread;
index = master_index;
} else {
- struct lu_tgt_desc *tgt;
+ struct lu_tgt_desc *mdt;
- ltd_foreach_tgt(&lod->lod_mdt_descs, tgt) {
- if (tgt->ltd_tgt == dt) {
- index = tgt->ltd_index;
- subtgt = tgt;
+ lod_foreach_mdt(lod, mdt) {
+ if (mdt->ltd_tgt == dt) {
+ index = mdt->ltd_index;
+ subtgt = mdt;
break;
}
}
static void lod_sub_stop_recovery_threads(const struct lu_env *env,
struct lod_device *lod)
{
- struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
struct ptlrpc_thread *thread;
- struct lu_tgt_desc *tgt;
+ struct lu_tgt_desc *mdt;
/*
* Stop the update log commit cancel threads and finish master
wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
}
- lod_getref(ltd);
- ltd_foreach_tgt(ltd, tgt) {
- thread = tgt->ltd_recovery_thread;
+ lod_getref(&lod->lod_mdt_descs);
+ lod_foreach_mdt(lod, mdt) {
+ thread = mdt->ltd_recovery_thread;
if (thread && thread->t_flags & SVC_RUNNING) {
thread->t_flags = SVC_STOPPING;
wake_up(&thread->t_ctl_waitq);
wait_event(thread->t_ctl_waitq,
thread->t_flags & SVC_STOPPED);
- OBD_FREE_PTR(tgt->ltd_recovery_thread);
- tgt->ltd_recovery_thread = NULL;
+ OBD_FREE_PTR(mdt->ltd_recovery_thread);
+ mdt->ltd_recovery_thread = NULL;
}
}
-
- lod_putref(lod, ltd);
+ lod_putref(lod, &lod->lod_mdt_descs);
}
/**
static void lod_sub_fini_all_llogs(const struct lu_env *env,
struct lod_device *lod)
{
- struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
- struct lu_tgt_desc *tgt;
+ struct lu_tgt_desc *mdt;
/*
* Stop the update log commit cancel threads and finish master
*/
lod_sub_fini_llog(env, lod->lod_child,
&lod->lod_child_recovery_thread);
- lod_getref(ltd);
- ltd_foreach_tgt(ltd, tgt)
- lod_sub_fini_llog(env, tgt->ltd_tgt,
- tgt->ltd_recovery_thread);
- lod_putref(lod, ltd);
+ lod_getref(&lod->lod_mdt_descs);
+ lod_foreach_mdt(lod, mdt)
+ lod_sub_fini_llog(env, mdt->ltd_tgt,
+ mdt->ltd_recovery_thread);
+ lod_putref(lod, &lod->lod_mdt_descs);
}
static char *lod_show_update_logs_retrievers(void *data, int *size, int *count)
{
struct lod_device *lod = (struct lod_device *)data;
struct lu_target *lut = lod2lu_dev(lod)->ld_site->ls_tgt;
- struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
- struct lod_tgt_desc *tgt = NULL;
+ struct lu_tgt_desc *mdt = NULL;
char *buf;
int len = 0;
int rc;
(*count)++;
}
- ltd_foreach_tgt(ltd, tgt) {
- if (!tgt->ltd_got_update_log) {
+ lod_foreach_mdt(lod, mdt) {
+ if (!mdt->ltd_got_update_log) {
rc = snprintf(buf + len, *size - len, " %04x",
- tgt->ltd_index);
+ mdt->ltd_index);
if (unlikely(rc <= 0))
break;
rc = lod_add_device(env, lod, arg1, index, gen,
mdt_index, LUSTRE_OSC_NAME, 0);
} else {
- rc = lod_del_device(env, lod,
- &lod->lod_ost_descs,
- arg1, index, gen, true);
+ rc = lod_del_device(env, lod, &lod->lod_ost_descs,
+ arg1, index, gen);
}
break;
*/
param = lustre_cfg_buf(lcfg, 1);
if (strstr(param, "osp") && strstr(param, ".active=")) {
- struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
struct lod_tgt_desc *sub_tgt = NULL;
- struct lu_tgt_desc *tgt;
+ struct lu_tgt_desc *mdt;
char *ptr;
char *tmp;
GOTO(out, rc);
}
- ltd_foreach_tgt(ltd, tgt) {
- if (tgt->ltd_tgt->dd_lu_dev.ld_obd == obd) {
- sub_tgt = tgt;
+ lod_foreach_mdt(lod, mdt) {
+ if (mdt->ltd_tgt->dd_lu_dev.ld_obd == obd) {
+ sub_tgt = mdt;
break;
}
}
{
struct lod_device *lod = lu2lod_dev(dev);
struct lu_device *next = &lod->lod_child->dd_lu_dev;
- unsigned int i;
+ struct lod_tgt_desc *tgt;
int rc;
ENTRY;
rc = next->ld_ops->ldo_recovery_complete(env, next);
lod_getref(&lod->lod_ost_descs);
- if (lod->lod_osts_size > 0) {
- cfs_foreach_bit(lod->lod_ost_bitmap, i) {
- struct lod_tgt_desc *tgt;
-
- tgt = OST_TGT(lod, i);
+ if (lod->lod_ost_descs.ltd_tgts_size > 0) {
+ lod_foreach_ost(lod, tgt) {
LASSERT(tgt && tgt->ltd_tgt);
- next = &tgt->ltd_ost->dd_lu_dev;
+ next = &tgt->ltd_tgt->dd_lu_dev;
rc = next->ld_ops->ldo_recovery_complete(env, next);
if (rc)
CERROR("%s: can't complete recovery on #%d: rc = %d\n",
- lod2obd(lod)->obd_name, i, rc);
+ lod2obd(lod)->obd_name, tgt->ltd_index,
+ rc);
}
}
lod_putref(lod, &lod->lod_ost_descs);
*/
static int lod_sub_init_llogs(const struct lu_env *env, struct lod_device *lod)
{
- struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
- struct lu_tgt_desc *tgt;
+ struct lu_tgt_desc *mdt;
int rc;
ENTRY;
if (rc < 0)
RETURN(rc);
- ltd_foreach_tgt(ltd, tgt) {
- rc = lod_sub_init_llog(env, lod, tgt->ltd_tgt);
+ lod_foreach_mdt(lod, mdt) {
+ rc = lod_sub_init_llog(env, lod, mdt->ltd_tgt);
if (rc != 0)
break;
}
struct obd_statfs *sfs, struct obd_statfs_info *info)
{
struct lod_device *lod = dt2lod_dev(dev);
- struct lod_ost_desc *ost;
- struct lod_mdt_desc *mdt;
+ struct lu_tgt_desc *tgt;
struct obd_statfs ost_sfs;
u64 ost_files = 0;
u64 ost_ffree = 0;
- int i, rc, bs;
+ int rc, bs;
rc = dt_statfs(env, dt2lod_dev(dev)->lod_child, sfs);
if (rc)
sfs->os_granted = 0;
lod_getref(&lod->lod_mdt_descs);
- lod_foreach_mdt(lod, i) {
- mdt = MDT_TGT(lod, i);
- LASSERT(mdt && mdt->ltd_mdt);
- rc = dt_statfs(env, mdt->ltd_mdt, &ost_sfs);
+ lod_foreach_mdt(lod, tgt) {
+ rc = dt_statfs(env, tgt->ltd_tgt, &ost_sfs);
/* ignore errors */
if (rc)
continue;
* just fallback to pre-DoM policy if any OST is alive
*/
lod_getref(&lod->lod_ost_descs);
- lod_foreach_ost(lod, i) {
- ost = OST_TGT(lod, i);
- LASSERT(ost && ost->ltd_ost);
- rc = dt_statfs(env, ost->ltd_ost, &ost_sfs);
+ lod_foreach_ost(lod, tgt) {
+ rc = dt_statfs(env, tgt->ltd_tgt, &ost_sfs);
/* ignore errors */
if (rc || ost_sfs.os_bsize == 0)
continue;
static int lod_sync(const struct lu_env *env, struct dt_device *dev)
{
struct lod_device *lod = dt2lod_dev(dev);
- struct lod_ost_desc *ost;
- struct lod_mdt_desc *mdt;
- unsigned int i;
+ struct lu_tgt_desc *tgt;
int rc = 0;
ENTRY;
lod_getref(&lod->lod_ost_descs);
- lod_foreach_ost(lod, i) {
- ost = OST_TGT(lod, i);
- LASSERT(ost && ost->ltd_ost);
- if (!ost->ltd_active)
+ lod_foreach_ost(lod, tgt) {
+ if (!tgt->ltd_active)
continue;
- rc = dt_sync(env, ost->ltd_ost);
+ rc = dt_sync(env, tgt->ltd_tgt);
if (rc) {
if (rc != -ENOTCONN) {
CERROR("%s: can't sync ost %u: rc = %d\n",
- lod2obd(lod)->obd_name, i, rc);
+ lod2obd(lod)->obd_name, tgt->ltd_index,
+ rc);
break;
}
rc = 0;
RETURN(rc);
lod_getref(&lod->lod_mdt_descs);
- lod_foreach_mdt(lod, i) {
- mdt = MDT_TGT(lod, i);
- LASSERT(mdt && mdt->ltd_mdt);
- if (!mdt->ltd_active)
+ lod_foreach_mdt(lod, tgt) {
+ if (!tgt->ltd_active)
continue;
- rc = dt_sync(env, mdt->ltd_mdt);
+ rc = dt_sync(env, tgt->ltd_tgt);
if (rc) {
if (rc != -ENOTCONN) {
CERROR("%s: can't sync mdt %u: rc = %d\n",
- lod2obd(lod)->obd_name, i, rc);
+ lod2obd(lod)->obd_name, tgt->ltd_index,
+ rc);
break;
}
rc = 0;
spin_lock_init(&lod->lod_lock);
spin_lock_init(&lod->lod_connects_lock);
- lu_tgt_descs_init(&lod->lod_mdt_descs);
- lu_tgt_descs_init(&lod->lod_ost_descs);
+ lu_tgt_descs_init(&lod->lod_mdt_descs, true);
+ lu_tgt_descs_init(&lod->lod_ost_descs, false);
RETURN(0);
lod_procfs_fini(lod);
- rc = lod_fini_tgt(env, lod, &lod->lod_ost_descs, true);
+ rc = lod_fini_tgt(env, lod, &lod->lod_ost_descs);
if (rc)
CERROR("%s: can not fini ost descriptors: rc = %d\n",
lod2obd(lod)->obd_name, rc);
- rc = lod_fini_tgt(env, lod, &lod->lod_mdt_descs, false);
+ rc = lod_fini_tgt(env, lod, &lod->lod_mdt_descs);
if (rc)
CERROR("%s: can not fini mdt descriptors: rc = %d\n",
lod2obd(lod)->obd_name, rc);
struct obd_device *obd = exp->exp_obd;
struct lod_device *d;
struct lod_tgt_desc *tgt;
- unsigned int i;
int rc = 1;
if (!obd->obd_set_up || obd->obd_stopping)
d = lu2lod_dev(obd->obd_lu_dev);
lod_getref(&d->lod_ost_descs);
- lod_foreach_ost(d, i) {
- tgt = OST_TGT(d, i);
- LASSERT(tgt && tgt->ltd_tgt);
+ lod_foreach_ost(d, tgt) {
rc = obd_get_info(env, tgt->ltd_exp, keylen, key,
vallen, val);
/* one healthy device is enough */
lod_putref(d, &d->lod_ost_descs);
lod_getref(&d->lod_mdt_descs);
- lod_foreach_mdt(d, i) {
+ lod_foreach_mdt(d, tgt) {
struct llog_ctxt *ctxt;
- tgt = MDT_TGT(d, i);
- LASSERT(tgt != NULL);
- LASSERT(tgt->ltd_tgt != NULL);
if (!tgt->ltd_active)
continue;
struct lod_device *d;
struct lod_tgt_desc *tgt;
int no_set = 0;
- int i, rc = 0, rc2;
+ int rc = 0, rc2;
ENTRY;
d = lu2lod_dev(obd->obd_lu_dev);
lod_getref(&d->lod_ost_descs);
- lod_foreach_ost(d, i) {
- tgt = OST_TGT(d, i);
- LASSERT(tgt && tgt->ltd_tgt);
+ lod_foreach_ost(d, tgt) {
if (!tgt->ltd_active)
continue;
lod_putref(d, &d->lod_ost_descs);
lod_getref(&d->lod_mdt_descs);
- lod_foreach_mdt(d, i) {
- tgt = MDT_TGT(d, i);
- LASSERT(tgt && tgt->ltd_tgt);
+ lod_foreach_mdt(d, tgt) {
if (!tgt->ltd_active)
continue;
rc2 = obd_set_info_async(env, tgt->ltd_exp, keylen, key,
.o_pool_del = lod_pool_del,
};
-static struct obd_type *sym;
-
static int __init lod_init(void)
{
+ struct obd_type *sym;
int rc;
rc = lu_kmem_init(lod_caches);
static void __exit lod_exit(void)
{
- if (!IS_ERR_OR_NULL(sym))
+ struct obd_type *sym = class_search_type(LUSTRE_LOV_NAME);
+
+ /* if this was never fully initialized by the lov layer
+ * then we are responsible for freeing this obd_type
+ */
+ if (sym) {
+ /* final put if we manage this obd type */
+ if (sym->typ_sym_filter)
+ kobject_put(&sym->typ_kobj);
+ /* put reference taken by class_search_type */
kobject_put(&sym->typ_kobj);
+ }
class_unregister_type(LUSTRE_LOD_NAME);
lu_kmem_fini(lod_caches);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff