static void osp_last_used_fini(const struct lu_env *env, struct osp_device *d)
{
- lu_object_put(env, &d->opd_last_used_file->do_lu);
- d->opd_last_used_file = NULL;
+ if (d->opd_last_used_file != NULL) {
+ lu_object_put(env, &d->opd_last_used_file->do_lu);
+ d->opd_last_used_file = NULL;
+ }
}
-static int osp_shutdown(const struct lu_env *env, struct osp_device *d)
+int osp_disconnect(struct osp_device *d)
{
- struct obd_import *imp;
- int rc = 0;
- ENTRY;
-
- /* release last_used file */
- osp_last_used_fini(env, d);
+ struct obd_import *imp;
+ int rc = 0;
imp = d->opd_obd->u.cli.cl_import;
/* Mark import deactivated now, so we don't try to reconnect if any
* of the cleanup RPCs fails (e.g. ldlm cancel, etc). We don't
* fully deactivate the import, or that would drop all requests. */
+ LASSERT(imp != NULL);
cfs_spin_lock(&imp->imp_lock);
imp->imp_deactive = 1;
cfs_spin_unlock(&imp->imp_lock);
(void)ptlrpc_pinger_del_import(imp);
rc = ptlrpc_disconnect_import(imp, 0);
- if (rc)
+ if (rc && rc != -ETIMEDOUT)
CERROR("%s: can't disconnect: rc = %d\n",
d->opd_obd->obd_name, rc);
ptlrpc_invalidate_import(imp);
+ RETURN(rc);
+}
+
+static int osp_shutdown(const struct lu_env *env, struct osp_device *d)
+{
+ int rc = 0;
+ ENTRY;
+
+ if (is_osp_on_ost(d->opd_obd->obd_name)) {
+ rc = osp_disconnect(d);
+ RETURN(rc);
+ }
+
+ LASSERT(env);
+ /* release last_used file */
+ osp_last_used_fini(env, d);
+
+ rc = osp_disconnect(d);
+
/* stop precreate thread */
osp_precreate_fini(d);
switch (lcfg->lcfg_command) {
case LCFG_CLEANUP:
- lu_dev_del_linkage(dev->ld_site, dev);
+ if (!is_osp_on_ost(d->opd_obd->obd_name))
+ lu_dev_del_linkage(dev->ld_site, dev);
rc = osp_shutdown(env, d);
break;
case LCFG_PARAM:
ENTRY;
- if (unlikely(d->opd_imp_active == 0)) {
- /*
- * in case of inactive OST we return nulls
- * so that caller can understand this device
- * is unusable for new objects
- *
- * XXX: shouldn't we take normal statfs and fill
- * just few specific fields with zeroes?
- */
- memset(sfs, 0, sizeof(*sfs));
- sfs->os_bsize = 4096;
- RETURN(0);
- }
+ if (unlikely(d->opd_imp_active == 0))
+ RETURN(-ENOTCONN);
/* return recently updated data */
*sfs = d->opd_statfs;
* how many objects are available for immediate creation
*/
cfs_spin_lock(&d->opd_pre_lock);
- sfs->os_ffree = d->opd_pre_last_created - d->opd_pre_next;
+ sfs->os_fprecreated = d->opd_pre_last_created - d->opd_pre_used_id;
+ sfs->os_fprecreated -= d->opd_pre_reserved;
cfs_spin_unlock(&d->opd_pre_lock);
+ LASSERT(sfs->os_fprecreated <= OST_MAX_PRECREATE);
+
CDEBUG(D_OTHER, "%s: "LPU64" blocks, "LPU64" free, "LPU64" avail, "
LPU64" files, "LPU64" free files\n", d->opd_obd->obd_name,
sfs->os_blocks, sfs->os_bfree, sfs->os_bavail,
RETURN(0);
}
-static const struct dt_device_operations osp_dt_ops = {
+const struct dt_device_operations osp_dt_ops = {
.dt_statfs = osp_statfs,
.dt_sync = osp_sync,
};
ENTRY;
+ if (cfs_atomic_read(&lu->ld_ref) && lu->ld_site) {
+ LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_ERROR, NULL);
+ lu_site_print(env, lu->ld_site, &msgdata, lu_cdebug_printer);
+ }
dt_device_fini(&m->opd_dt_dev);
OBD_FREE_PTR(m);
RETURN(NULL);
l = osp2lu_dev(m);
dt_device_init(&m->opd_dt_dev, t);
- rc = osp_init0(env, m, t, lcfg);
+ if (is_osp_on_ost(lustre_cfg_string(lcfg, 0)))
+ rc = osp_init_for_ost(env, m, t, lcfg);
+ else
+ rc = osp_init0(env, m, t, lcfg);
if (rc != 0) {
osp_device_free(env, l);
l = ERR_PTR(rc);
ENTRY;
- LASSERT(m->opd_storage_exp);
- obd_disconnect(m->opd_storage_exp);
+ if (m->opd_storage_exp)
+ obd_disconnect(m->opd_storage_exp);
+
+ if (is_osp_on_ost(m->opd_obd->obd_name))
+ osp_fini_for_ost(m);
imp = m->opd_obd->u.cli.cl_import;
RETURN(rc);
*exp = class_conn2export(&conn);
+ if (is_osp_on_ost(obd->obd_name))
+ osp->opd_exp = *exp;
/* Why should there ever be more than 1 connect? */
osp->opd_connects++;
OBD_CONNECT_OSS_CAPA |
OBD_CONNECT_REQPORTAL |
OBD_CONNECT_SKIP_ORPHAN |
- OBD_CONNECT_VERSION;
+ OBD_CONNECT_VERSION |
+ OBD_CONNECT_FID;
+
+ if (is_osp_on_ost(osp->opd_obd->obd_name))
+ ocd->ocd_connect_flags |= OBD_CONNECT_LIGHTWEIGHT;
+
ocd->ocd_version = LUSTRE_VERSION_CODE;
LASSERT(data->ocd_connect_flags & OBD_CONNECT_INDEX);
ocd->ocd_index = data->ocd_index;
struct obd_device *obd = exp->exp_obd;
struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev);
int rc;
-
ENTRY;
/* Only disconnect the underlying layers on the final disconnect. */
osp->opd_connects--;
rc = class_disconnect(exp);
+ if (rc) {
+ CERROR("%s: class disconnect error: rc = %d\n",
+ obd->obd_name, rc);
+ RETURN(rc);
+ }
/* destroy the device */
- if (rc == 0)
+ if (!is_osp_on_ost(obd->obd_name))
class_manual_cleanup(obd);
RETURN(rc);
case IMP_EVENT_DISCON:
d->opd_got_disconnected = 1;
d->opd_imp_connected = 0;
+ if (is_osp_on_ost(d->opd_obd->obd_name))
+ break;
osp_pre_update_status(d, -ENODEV);
cfs_waitq_signal(&d->opd_pre_waitq);
CDEBUG(D_HA, "got disconnected\n");
break;
case IMP_EVENT_INACTIVE:
d->opd_imp_active = 0;
+ if (is_osp_on_ost(d->opd_obd->obd_name))
+ break;
osp_pre_update_status(d, -ENODEV);
cfs_waitq_signal(&d->opd_pre_waitq);
CDEBUG(D_HA, "got inactive\n");
d->opd_new_connection = 1;
d->opd_imp_connected = 1;
d->opd_imp_seen_connected = 1;
+ if (is_osp_on_ost(d->opd_obd->obd_name))
+ break;
cfs_waitq_signal(&d->opd_pre_waitq);
__osp_sync_check_for_work(d);
CDEBUG(D_HA, "got connected\n");
break;
+ case IMP_EVENT_INVALIDATE:
+ if (obd->obd_namespace == NULL)
+ break;
+ ldlm_namespace_cleanup(obd->obd_namespace, LDLM_FL_LOCAL_ONLY);
+ break;
+ case IMP_EVENT_OCD:
+ break;
default:
CERROR("%s: unsupported import event: %#x\n",
obd->obd_name, event);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff