* 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/
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);
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;
ENTRY;
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:
lu_dev_del_linkage(dev->ld_site, dev);
rc = osp_shutdown(env, d);
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,
RETURN(-EINVAL);
}
m->opd_index = idx;
+ m->opd_group = 0;
idx = tgt - src;
} else {
/* New OSC name fsname-OSTXXXX-osc-MDTXXXX */
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);
+ obd_cleanup_client_import(obd);
+ if (m->opd_symlink)
+ lprocfs_remove(&m->opd_symlink);
client_obd_cleanup(obd);
out_ref:
ptlrpcd_decref();