}
};
+static int ofd_connect_to_next(const struct lu_env *env, struct ofd_device *m,
+ const char *next, struct obd_export **exp)
+{
+ struct obd_connect_data *data = NULL;
+ struct obd_device *obd;
+ int rc;
+ ENTRY;
+
+ OBD_ALLOC_PTR(data);
+ if (data == NULL)
+ GOTO(out, rc = -ENOMEM);
+
+ obd = class_name2obd(next);
+ if (obd == NULL) {
+ CERROR("%s: can't locate next device: %s\n",
+ m->ofd_dt_dev.dd_lu_dev.ld_obd->obd_name, next);
+ GOTO(out, rc = -ENOTCONN);
+ }
+
+ data->ocd_connect_flags = OBD_CONNECT_VERSION;
+ data->ocd_version = LUSTRE_VERSION_CODE;
+
+ rc = obd_connect(NULL, exp, obd, &obd->obd_uuid, data, NULL);
+ if (rc) {
+ CERROR("%s: cannot connect to next dev %s: rc = %d\n",
+ m->ofd_dt_dev.dd_lu_dev.ld_obd->obd_name, next, rc);
+ GOTO(out, rc);
+ }
+
+ m->ofd_dt_dev.dd_lu_dev.ld_site =
+ m->ofd_osd_exp->exp_obd->obd_lu_dev->ld_site;
+ LASSERT(m->ofd_dt_dev.dd_lu_dev.ld_site);
+ m->ofd_osd = lu2dt_dev(m->ofd_osd_exp->exp_obd->obd_lu_dev);
+ m->ofd_dt_dev.dd_lu_dev.ld_site->ls_top_dev = &m->ofd_dt_dev.dd_lu_dev;
+
+out:
+ if (data)
+ OBD_FREE_PTR(data);
+ RETURN(rc);
+}
+
static int ofd_stack_init(const struct lu_env *env,
struct ofd_device *m, struct lustre_cfg *cfg)
{
- struct lu_device *ofd_lu = &m->ofd_dt_dev.dd_lu_dev;
const char *dev = lustre_cfg_string(cfg, 0);
- struct obd_type *type;
- struct lu_device_type *ldt;
struct lu_device *d;
struct ofd_thread_info *info = ofd_info(env);
+ struct lustre_mount_info *lmi;
int rc;
+ char *osdname;
ENTRY;
- /* XXX: we should be able to use different OSDs here */
- type = class_get_type(LUSTRE_OSD_NAME);
- if (!type) {
- CERROR("Unknown type: '%s'\n", LUSTRE_OSD_NAME);
+ lmi = server_get_mount(dev);
+ if (lmi == NULL) {
+ CERROR("Cannot get mount info for %s!\n", dev);
RETURN(-ENODEV);
}
- rc = lu_env_refill((struct lu_env *)env);
- if (rc != 0) {
- CERROR("Failure to refill session: '%d'\n", rc);
- GOTO(out_type, rc);
- }
-
- ldt = type->typ_lu;
- if (ldt == NULL) {
- CERROR("type: '%s'\n", LUSTRE_OSD_NAME);
- GOTO(out_type, rc = -EINVAL);
- }
+ /* find bottom osd */
+ OBD_ALLOC(osdname, MTI_NAME_MAXLEN);
+ if (osdname == NULL)
+ RETURN(-ENOMEM);
- ldt->ldt_obd_type = type;
- d = ldt->ldt_ops->ldto_device_alloc(env, ldt, cfg);
- if (IS_ERR(d)) {
- CERROR("Cannot allocate device: '%s'\n", LUSTRE_OSD_NAME);
- GOTO(out_type, rc = -ENODEV);
- }
+ snprintf(osdname, MTI_NAME_MAXLEN, "%s-osd", dev);
+ rc = ofd_connect_to_next(env, m, osdname, &m->ofd_osd_exp);
+ OBD_FREE(osdname, MTI_NAME_MAXLEN);
+ if (rc)
+ RETURN(rc);
- LASSERT(ofd_lu->ld_site);
- d->ld_site = ofd_lu->ld_site;
+ d = m->ofd_osd_exp->exp_obd->obd_lu_dev;
+ LASSERT(d);
+ m->ofd_osd = lu2dt_dev(d);
snprintf(info->fti_u.name, sizeof(info->fti_u.name),
"%s-osd", lustre_cfg_string(cfg, 0));
- type->typ_refcnt++;
- rc = ldt->ldt_ops->ldto_device_init(env, d, dev, NULL);
- if (rc) {
- CERROR("can't init device '%s', rc %d\n", LUSTRE_OSD_NAME, rc);
- GOTO(out_free, rc);
- }
- lu_device_get(d);
- lu_ref_add(&d->ld_reference, "lu-stack", &lu_site_init);
-
- m->ofd_osd = lu2dt_dev(d);
-
- /* process setup config */
- rc = d->ld_ops->ldo_process_config(env, d, cfg);
- if (rc)
- GOTO(out_fini, rc);
-
- RETURN(rc);
-
-out_fini:
- ldt->ldt_ops->ldto_device_fini(env, d);
-out_free:
- type->typ_refcnt--;
- ldt->ldt_ops->ldto_device_free(env, d);
-out_type:
- class_put_type(type);
RETURN(rc);
}
top->ld_ops->ldo_process_config(env, top, lcfg);
lustre_cfg_free(lcfg);
- lu_stack_fini(env, &m->ofd_osd->dd_lu_dev);
+ lu_site_purge(env, top->ld_site, ~0);
+
+ LASSERT(m->ofd_osd_exp);
+ obd_disconnect(m->ofd_osd_exp);
m->ofd_osd = NULL;
EXIT;
}
+/* For interoperability, see mdt_interop_param[]. */
+static struct cfg_interop_param ofd_interop_param[] = {
+ { "ost.quota_type", NULL },
+ { NULL }
+};
+
/* used by MGS to process specific configurations */
static int ofd_process_config(const struct lu_env *env, struct lu_device *d,
struct lustre_cfg *cfg)
case LCFG_PARAM: {
struct lprocfs_static_vars lvars;
+ /* For interoperability */
+ struct cfg_interop_param *ptr = NULL;
+ struct lustre_cfg *old_cfg = NULL;
+ char *param = NULL;
+
+ param = lustre_cfg_string(cfg, 1);
+ if (param == NULL) {
+ CERROR("param is empty\n");
+ rc = -EINVAL;
+ break;
+ }
+
+ ptr = class_find_old_param(param, ofd_interop_param);
+ if (ptr != NULL) {
+ if (ptr->new_param == NULL) {
+ rc = 0;
+ CWARN("For interoperability, skip this %s."
+ " It is obsolete.\n", ptr->old_param);
+ break;
+ }
+
+ CWARN("Found old param %s, changed it to %s.\n",
+ ptr->old_param, ptr->new_param);
+
+ old_cfg = cfg;
+ cfg = lustre_cfg_rename(old_cfg, ptr->new_param);
+ if (IS_ERR(cfg)) {
+ rc = PTR_ERR(cfg);
+ break;
+ }
+ }
+
lprocfs_ofd_init_vars(&lvars);
rc = class_process_proc_param(PARAM_OST, lvars.obd_vars, cfg,
d->ld_obd);
extern int ost_handle(struct ptlrpc_request *req);
-static int ofd_start(const struct lu_env *env, struct lu_device *dev)
+static int ofd_prepare(const struct lu_env *env, struct lu_device *pdev,
+ struct lu_device *dev)
{
+ struct ofd_thread_info *info;
struct ofd_device *ofd = ofd_dev(dev);
+ struct obd_device *obd = ofd_obd(ofd);
struct lu_device *next = &ofd->ofd_osd->dd_lu_dev;
int rc;
ENTRY;
+ rc = lu_env_refill((struct lu_env *)env);
+ if (rc != 0) {
+ CERROR("Failure to refill session: '%d'\n", rc);
+ RETURN(rc);
+ }
+
+ info = ofd_info_init(env, NULL);
+ if (info == NULL)
+ RETURN(-EFAULT);
+
/* initialize lower device */
rc = next->ld_ops->ldo_prepare(env, dev, next);
+ target_recovery_init(&ofd->ofd_lut, ost_handle);
+ LASSERT(obd->obd_no_conn);
+ spin_lock(&obd->obd_dev_lock);
+ obd->obd_no_conn = 0;
+ spin_unlock(&obd->obd_dev_lock);
+
+ if (obd->obd_recovering == 0)
+ ofd_postrecov(env, ofd);
+
RETURN(rc);
}
.ldo_object_alloc = ofd_object_alloc,
.ldo_process_config = ofd_process_config,
.ldo_recovery_complete = ofd_recovery_complete,
+ .ldo_prepare = ofd_prepare,
};
static int ofd_procfs_init(struct ofd_device *ofd)
obd->obd_name, rc);
GOTO(free_obd_stats, rc);
}
- RETURN(0);
+ rc = lprocfs_job_stats_init(obd, LPROC_OFD_STATS_LAST,
+ ofd_stats_counter_init);
+ if (rc)
+ GOTO(remove_entry_clear, rc);
+ RETURN(0);
+remove_entry_clear:
+ lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
free_obd_stats:
lprocfs_free_obd_stats(obd);
obd_cleanup:
{
struct obd_device *obd = ofd_obd(ofd);
+ lprocfs_job_stats_fini(obd);
lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
lprocfs_free_per_client_stats(obd);
lprocfs_free_obd_stats(obd);
m->ofd_fmd_max_num = OFD_FMD_MAX_NUM_DEFAULT;
m->ofd_fmd_max_age = OFD_FMD_MAX_AGE_DEFAULT;
- cfs_spin_lock_init(&m->ofd_flags_lock);
+ spin_lock_init(&m->ofd_flags_lock);
m->ofd_raid_degraded = 0;
m->ofd_syncjournal = 0;
ofd_slc_set(m);
m->ofd_grant_compat_disable = 0;
/* statfs data */
- cfs_spin_lock_init(&m->ofd_osfs_lock);
+ spin_lock_init(&m->ofd_osfs_lock);
m->ofd_osfs_age = cfs_time_shift_64(-1000);
m->ofd_osfs_unstable = 0;
m->ofd_statfs_inflight = 0;
m->ofd_osfs_inflight = 0;
/* grant data */
- cfs_spin_lock_init(&m->ofd_grant_lock);
+ spin_lock_init(&m->ofd_grant_lock);
m->ofd_tot_dirty = 0;
m->ofd_tot_granted = 0;
m->ofd_tot_pending = 0;
m->ofd_max_group = 0;
- cfs_rwlock_init(&obd->u.filter.fo_sptlrpc_lock);
+ rwlock_init(&obd->u.filter.fo_sptlrpc_lock);
sptlrpc_rule_set_init(&obd->u.filter.fo_sptlrpc_rset);
obd->u.filter.fo_fl_oss_capa = 0;
if (info == NULL)
RETURN(-EFAULT);
- rc = lu_site_init(&m->ofd_site, &m->ofd_dt_dev.dd_lu_dev);
- if (rc)
- GOTO(err_fini_proc, rc);
- m->ofd_site.ls_top_dev = &m->ofd_dt_dev.dd_lu_dev;
-
rc = ofd_stack_init(env, m, cfg);
if (rc) {
CERROR("Can't init device stack, rc %d\n", rc);
- GOTO(err_lu_site, rc);
+ GOTO(err_fini_proc, rc);
}
/* populate cached statfs data */
obd->obd_name, osfs->os_bsize);
GOTO(err_fini_stack, rc = -EPROTO);
}
- m->ofd_blockbits = cfs_fls(osfs->os_bsize) - 1;
+ m->ofd_blockbits = fls(osfs->os_bsize) - 1;
+
+ m->ofd_precreate_batch = OFD_PRECREATE_BATCH_DEFAULT;
+ if (osfs->os_bsize * osfs->os_blocks < OFD_PRECREATE_SMALL_FS)
+ m->ofd_precreate_batch = OFD_PRECREATE_BATCH_SMALL;
snprintf(info->fti_u.name, sizeof(info->fti_u.name), "filter-%p", m);
m->ofd_namespace = ldlm_namespace_new(obd, info->fti_u.name,
GOTO(err_fini_stack, rc = -ENOMEM);
/* set obd_namespace for compatibility with old code */
obd->obd_namespace = m->ofd_namespace;
+ ldlm_register_intent(m->ofd_namespace, ofd_intent_policy);
+ m->ofd_namespace->ns_lvbo = &ofd_lvbo;
+ m->ofd_namespace->ns_lvbp = m;
+
+ ptlrpc_init_client(LDLM_CB_REQUEST_PORTAL, LDLM_CB_REPLY_PORTAL,
+ "filter_ldlm_cb_client", &obd->obd_ldlm_client);
dt_conf_get(env, m->ofd_osd, &m->ofd_dt_conf);
m->ofd_grant_ratio =
ofd_grant_ratio_conv(m->ofd_dt_conf.ddp_grant_reserved);
- rc = ofd_start(env, &m->ofd_dt_dev.dd_lu_dev);
- if (rc)
- GOTO(err_fini_stack, rc);
-
- rc = lut_init(env, &m->ofd_lut, obd, m->ofd_osd);
+ rc = tgt_init(env, &m->ofd_lut, obd, m->ofd_osd);
if (rc)
GOTO(err_free_ns, rc);
if (rc)
GOTO(err_fini_lut, rc);
- target_recovery_init(&m->ofd_lut, ost_handle);
-
- rc = lu_site_init_finish(&m->ofd_site);
- if (rc)
- GOTO(err_fs_cleanup, rc);
-
RETURN(0);
-err_fs_cleanup:
- target_recovery_fini(obd);
- ofd_fs_cleanup(env, m);
err_fini_lut:
- lut_fini(env, &m->ofd_lut);
+ tgt_fini(env, &m->ofd_lut);
err_free_ns:
ldlm_namespace_free(m->ofd_namespace, 0, obd->obd_force);
obd->obd_namespace = m->ofd_namespace = NULL;
err_fini_stack:
ofd_stack_fini(env, m, &m->ofd_osd->dd_lu_dev);
-err_lu_site:
- lu_site_fini(&m->ofd_site);
err_fini_proc:
ofd_procfs_fini(m);
return rc;
obd_exports_barrier(obd);
obd_zombie_barrier();
- lut_fini(env, &m->ofd_lut);
+ tgt_fini(env, &m->ofd_lut);
ofd_fs_cleanup(env, m);
ofd_free_capa_keys(m);
d->ld_obd->obd_namespace = m->ofd_namespace = NULL;
}
- ofd_stack_fini(env, m, m->ofd_site.ls_top_dev);
- lu_site_fini(&m->ofd_site);
+ ofd_stack_fini(env, m, &m->ofd_dt_dev.dd_lu_dev);
ofd_procfs_fini(m);
LASSERT(cfs_atomic_read(&d->ld_ref) == 0);
+ server_put_mount(obd->obd_name, NULL);
EXIT;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff