* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Di Wang <di.wang@intel.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_MDS
#include <obd_class.h>
#include "osp_internal.h"
/* Slab for OSP object allocation */
-cfs_mem_cache_t *osp_object_kmem;
+struct kmem_cache *osp_object_kmem;
static struct lu_kmem_descr osp_caches[] = {
{
const struct lu_object_header *hdr,
struct lu_device *d)
{
- struct lu_object_header *h;
+ struct lu_object_header *h = NULL;
struct osp_object *o;
struct lu_object *l;
- LASSERT(hdr == NULL);
-
- OBD_SLAB_ALLOC_PTR_GFP(o, osp_object_kmem, CFS_ALLOC_IO);
+ OBD_SLAB_ALLOC_PTR_GFP(o, osp_object_kmem, __GFP_IO);
if (o != NULL) {
l = &o->opo_obj.do_lu;
- h = &o->opo_header;
- lu_object_header_init(h);
- dt_object_init(&o->opo_obj, h, d);
- lu_object_add_top(h, l);
+ /* For data object, OSP obj would always be the top
+ * object, i.e. hdr is always NULL, see lu_object_alloc.
+ * But for metadata object, we always build the object
+ * stack from MDT. i.e. mdt_object will be the top object
+ * i.e. hdr != NULL */
+ if (hdr == NULL) {
+ /* object for OST */
+ h = &o->opo_header;
+ lu_object_header_init(h);
+ dt_object_init(&o->opo_obj, h, d);
+ lu_object_add_top(h, l);
+ } else {
+ dt_object_init(&o->opo_obj, h, d);
+ }
l->lo_ops = &osp_lu_obj_ops;
}
}
-int osp_disconnect(struct osp_device *d)
+static int osp_disconnect(struct osp_device *d)
{
struct obd_import *imp;
int rc = 0;
int rc = 0;
ENTRY;
- if (is_osp_for_connection(d->opd_obd->obd_name)) {
- rc = osp_disconnect(d);
- RETURN(rc);
- }
-
LASSERT(env);
- /* release last_used file */
- if (!d->opd_connect_mdt)
- osp_last_used_fini(env, d);
rc = osp_disconnect(d);
/* stop sync thread */
osp_sync_fini(d);
+
+ /* release last_used file */
+ osp_last_used_fini(env, d);
}
obd_fid_fini(d->opd_obd);
ENTRY;
switch (lcfg->lcfg_command) {
+ case LCFG_PRE_CLEANUP:
+ rc = osp_disconnect(d);
+ break;
case LCFG_CLEANUP:
- if (!is_osp_for_connection(d->opd_obd->obd_name))
- lu_dev_del_linkage(dev->ld_site, dev);
+ lu_dev_del_linkage(dev->ld_site, dev);
rc = osp_shutdown(env, d);
break;
case LCFG_PARAM:
ENTRY;
osp->opd_recovery_completed = 1;
if (!osp->opd_connect_mdt)
- cfs_waitq_signal(&osp->opd_pre_waitq);
+ wake_up(&osp->opd_pre_waitq);
RETURN(rc);
}
const struct dt_device_operations osp_dt_ops = {
.dt_statfs = osp_statfs,
.dt_sync = osp_sync,
+ .dt_trans_start = osp_trans_start,
+ .dt_trans_stop = osp_trans_stop,
};
static int osp_connect_to_osd(const struct lu_env *env, struct osp_device *m,
struct obd_import *imp;
class_uuid_t uuid;
char *src, *tgt, *mdt, *osdname = NULL;
- int rc, idx;
+ int rc;
+ long idx;
ENTRY;
RETURN(-EINVAL);
}
m->opd_index = idx;
+ m->opd_group = 0;
idx = tgt - src;
} else {
/* New OSC name fsname-OSTXXXX-osc-MDTXXXX */
if (strncmp(tgt, "-MDT", 4) != 0 &&
- strncmp(tgt, "-OST", 4) != 0) {
+ strncmp(tgt, "-OST", 4) != 0) {
CERROR("%s: invalid target name %s\n",
m->opd_obd->obd_name, lustre_cfg_string(cfg, 0));
RETURN(-EINVAL);
}
+ idx = simple_strtol(tgt + 4, &mdt, 16);
+ if (*mdt != '\0' || idx > INT_MAX || idx < 0) {
+ CERROR("%s: invalid OST index in '%s'\n",
+ m->opd_obd->obd_name, src);
+ RETURN(-EINVAL);
+ }
+
+ /* Get MDT index from the name and set it to opd_group,
+ * which will be used by OSP to connect with OST */
+ m->opd_group = idx;
if (tgt - src <= 12) {
- CERROR("%s: invalid target name %s\n",
+ CERROR("%s: invalid mdt index retrieve from %s\n",
m->opd_obd->obd_name, lustre_cfg_string(cfg, 0));
RETURN(-EINVAL);
}
OBD_ALLOC(cli->cl_rpc_lock, sizeof(*cli->cl_rpc_lock));
if (!cli->cl_rpc_lock)
- RETURN(-ENOMEM);
+ GOTO(out_fini, rc = -ENOMEM);
osp_init_rpc_lock(cli->cl_rpc_lock);
}
rc = osp_last_used_init(env, m);
if (rc)
GOTO(out_proc, rc);
+
+ rc = obd_fid_init(m->opd_obd, NULL, LUSTRE_SEQ_DATA);
+ if (rc) {
+ CERROR("%s: fid init error: rc = %d\n",
+ m->opd_obd->obd_name, rc);
+ GOTO(out_last_used, rc);
+ }
+
/* Initialize precreation thread, it handles new
* connections as well. */
rc = osp_init_precreate(m);
if (rc)
GOTO(out_precreat, rc);
- rc = obd_fid_init(m->opd_obd, NULL, LUSTRE_SEQ_DATA);
- if (rc) {
- CERROR("%s: fid init error: rc = %d\n",
- m->opd_obd->obd_name, rc);
- GOTO(out, rc);
- }
}
/*
* Initiate connect to OST
if (!m->opd_connect_mdt)
osp_precreate_fini(m);
out_last_used:
- osp_last_used_fini(env, m);
+ if (!m->opd_connect_mdt)
+ osp_last_used_fini(env, m);
out_proc:
ptlrpc_lprocfs_unregister_obd(obd);
lprocfs_obd_cleanup(obd);
- class_destroy_import(obd->u.cli.cl_import);
+ if (m->opd_symlink)
+ lprocfs_remove(&m->opd_symlink);
client_obd_cleanup(obd);
out_ref:
ptlrpcd_decref();
l = osp2lu_dev(m);
dt_device_init(&m->opd_dt_dev, t);
- if (is_osp_for_connection(lustre_cfg_string(lcfg, 0)))
- rc = osp_init_for_ost(env, m, t, lcfg);
- else
- rc = osp_init0(env, m, t, lcfg);
+ rc = osp_init0(env, m, t, lcfg);
if (rc != 0) {
osp_device_free(env, l);
l = ERR_PTR(rc);
if (m->opd_storage_exp)
obd_disconnect(m->opd_storage_exp);
- if (is_osp_for_connection(m->opd_obd->obd_name))
- osp_fini_for_ost(m);
-
imp = m->opd_obd->u.cli.cl_import;
if (imp->imp_rq_pool) {
imp->imp_rq_pool = NULL;
}
- obd_cleanup_client_import(m->opd_obd);
-
if (m->opd_symlink)
lprocfs_remove(&m->opd_symlink);
RETURN(rc);
*exp = class_conn2export(&conn);
- osp->opd_exp = *exp;
-
/* Why should there ever be more than 1 connect? */
osp->opd_connects++;
LASSERT(osp->opd_connects == 1);
LASSERT(data->ocd_connect_flags & OBD_CONNECT_INDEX);
ocd = &imp->imp_connect_data;
*ocd = *data;
- if (is_osp_for_connection(osp->opd_obd->obd_name))
- ocd->ocd_connect_flags |= OBD_CONNECT_LIGHTWEIGHT;
imp->imp_connect_flags_orig = ocd->ocd_connect_flags;
ptlrpc_pinger_add_import(imp);
- if (osp->opd_connect_mdt && data->ocd_index == 0 &&
- !is_osp_for_connection(obd->obd_name)) {
+ if (osp->opd_connect_mdt && data->ocd_index == 0) {
+ /* set seq controller export for MDC0 if exists */
struct seq_server_site *ss;
ss = lu_site2seq(osp2lu_dev(osp)->ld_site);
ss->ss_control_exp = class_export_get(*exp);
ss->ss_server_fld->lsf_control_exp = *exp;
}
-
out:
RETURN(rc);
}
}
/* destroy the device */
- if (!is_osp_for_connection(obd->obd_name))
- class_manual_cleanup(obd);
+ class_manual_cleanup(obd);
RETURN(rc);
}
if (d->opd_connect_mdt)
break;
osp_pre_update_status(d, -ENODEV);
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
CDEBUG(D_HA, "got disconnected\n");
break;
case IMP_EVENT_INACTIVE:
if (d->opd_connect_mdt)
break;
osp_pre_update_status(d, -ENODEV);
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
CDEBUG(D_HA, "got inactive\n");
break;
case IMP_EVENT_ACTIVE:
d->opd_imp_seen_connected = 1;
if (d->opd_connect_mdt)
break;
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
__osp_sync_check_for_work(d);
CDEBUG(D_HA, "got connected\n");
break;
d = lu2osp_dev(obd->obd_lu_dev);
LASSERT(d->opd_dt_dev.dd_ops == &osp_dt_ops);
- if (!cfs_try_module_get(THIS_MODULE)) {
+ if (!try_module_get(THIS_MODULE)) {
CERROR("%s: can't get module. Is it alive?", obd->obd_name);
return -EINVAL;
}
break;
default:
CERROR("%s: unrecognized ioctl %#x by %s\n", obd->obd_name,
- cmd, cfs_curproc_comm());
+ cmd, current_comm());
rc = -ENOTTY;
}
- cfs_module_put(THIS_MODULE);
+ module_put(THIS_MODULE);
return rc;
}
return rc;
}
+ lprocfs_lwp_init_vars(&lvars);
+
+ rc = class_register_type(&lwp_obd_device_ops, NULL, lvars.module_vars,
+ LUSTRE_LWP_NAME, &lwp_device_type);
+ if (rc != 0) {
+ class_unregister_type(LUSTRE_OSP_NAME);
+ lu_kmem_fini(osp_caches);
+ return rc;
+ }
+
/* Note: add_rec/delcare_add_rec will be only used by catalogs */
osp_mds_ost_orig_logops = llog_osd_ops;
osp_mds_ost_orig_logops.lop_add = llog_cat_add_rec;
{
lprocfs_try_remove_proc_entry("osc", proc_lustre_root);
+ class_unregister_type(LUSTRE_LWP_NAME);
class_unregister_type(LUSTRE_OSP_NAME);
lu_kmem_fini(osp_caches);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff