* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <obd_class.h>
#include <lustre_param.h>
+#include <lustre_log.h>
#include "osp_internal.h"
if (rc)
GOTO(out, rc);
}
+ CDEBUG(D_HA, "%s: Read last used ID: "LPU64"\n", m->opd_obd->obd_name,
+ le64_to_cpu(m->opd_last_used_id));
RETURN(0);
out:
CERROR("%s: can't initialize lov_objid: %d\n",
* 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);
+ spin_lock(&imp->imp_lock);
imp->imp_deactive = 1;
- cfs_spin_unlock(&imp->imp_lock);
+ spin_unlock(&imp->imp_lock);
ptlrpc_deactivate_import(imp);
(void)ptlrpc_pinger_del_import(imp);
rc = ptlrpc_disconnect_import(imp, 0);
- if (rc && rc != -ETIMEDOUT)
+ if (rc == -ETIMEDOUT || rc == -ENOTCONN || rc == -ESHUTDOWN)
+ rc = 0;
+ if (rc)
CERROR("%s: can't disconnect: rc = %d\n",
d->opd_obd->obd_name, rc);
* layer above osp (usually lod) can use ffree to estimate
* how many objects are available for immediate creation
*/
- cfs_spin_lock(&d->opd_pre_lock);
+ spin_lock(&d->opd_pre_lock);
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);
+ spin_unlock(&d->opd_pre_lock);
- LASSERT(sfs->os_fprecreated <= OST_MAX_PRECREATE);
+ LASSERT(sfs->os_fprecreated <= OST_MAX_PRECREATE * 2);
CDEBUG(D_OTHER, "%s: "LPU64" blocks, "LPU64" free, "LPU64" avail, "
LPU64" files, "LPU64" free files\n", d->opd_obd->obd_name,
static int osp_init0(const struct lu_env *env, struct osp_device *m,
struct lu_device_type *ldt, struct lustre_cfg *cfg)
{
- struct lprocfs_static_vars lvars = { 0 };
- struct proc_dir_entry *osc_proc_dir;
+ struct obd_device *obd;
struct obd_import *imp;
class_uuid_t uuid;
char *src, *ost, *mdt, *osdname = NULL;
ENTRY;
- m->opd_obd = class_name2obd(lustre_cfg_string(cfg, 0));
- if (m->opd_obd == NULL) {
+ obd = class_name2obd(lustre_cfg_string(cfg, 0));
+ if (obd == NULL) {
CERROR("Cannot find obd with name %s\n",
lustre_cfg_string(cfg, 0));
RETURN(-ENODEV);
}
+ m->opd_obd = obd;
/* There is no record in the MDT configuration for the local disk
* device, so we have to extract this from elsewhere in the profile.
idx = simple_strtol(ost + 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);
+ CERROR("%s: invalid OST index in '%s'\n", obd->obd_name, src);
GOTO(out_fini, rc = -EINVAL);
}
m->opd_index = idx;
idx = ost - src;
/* check the fsname length, and after this everything else will fit */
if (idx > MTI_NAME_MAXLEN) {
- CERROR("%s: fsname too long in '%s'\n",
- m->opd_obd->obd_name, src);
+ CERROR("%s: fsname too long in '%s'\n", obd->obd_name, src);
GOTO(out_fini, rc = -EINVAL);
}
else
strcat(osdname, mdt);
strcat(osdname, "-osd");
- CDEBUG(D_HA, "%s: connect to %s (%s)\n",
- m->opd_obd->obd_name, osdname, src);
+ CDEBUG(D_HA, "%s: connect to %s (%s)\n", obd->obd_name, osdname, src);
m->opd_dt_dev.dd_lu_dev.ld_ops = &osp_lu_ops;
m->opd_dt_dev.dd_ops = &osp_dt_ops;
- m->opd_obd->obd_lu_dev = &m->opd_dt_dev.dd_lu_dev;
+ obd->obd_lu_dev = &m->opd_dt_dev.dd_lu_dev;
rc = osp_connect_to_osd(env, m, osdname);
if (rc)
if (rc)
GOTO(out_disconnect, rc);
- rc = client_obd_setup(m->opd_obd, cfg);
+ rc = client_obd_setup(obd, cfg);
if (rc) {
CERROR("%s: can't setup obd: %d\n", m->opd_obd->obd_name, rc);
GOTO(out_ref, rc);
}
- lprocfs_osp_init_vars(&lvars);
- if (lprocfs_obd_setup(m->opd_obd, lvars.obd_vars) == 0)
- ptlrpc_lprocfs_register_obd(m->opd_obd);
-
- /* for compatibility we link old procfs's OSC entries to osp ones */
- osc_proc_dir = lprocfs_srch(proc_lustre_root, "osc");
- if (osc_proc_dir) {
- cfs_proc_dir_entry_t *symlink = NULL;
- char *name;
-
- OBD_ALLOC(name, strlen(m->opd_obd->obd_name) + 1);
- if (name == NULL)
- GOTO(out, rc = -ENOMEM);
-
- strcpy(name, m->opd_obd->obd_name);
- if (strstr(name, "osc"))
- symlink = lprocfs_add_symlink(name, osc_proc_dir,
- "../osp/%s",
- m->opd_obd->obd_name);
- OBD_FREE(name, strlen(m->opd_obd->obd_name) + 1);
- m->opd_symlink = symlink;
- }
+ osp_lprocfs_init(m);
/*
* Initialize last id from the storage - will be used in orphan cleanup
ll_generate_random_uuid(uuid);
class_uuid_unparse(uuid, &m->opd_cluuid);
- imp = m->opd_obd->u.cli.cl_import;
+ imp = obd->u.cli.cl_import;
rc = ptlrpc_init_import(imp);
if (rc)
out_last_used:
osp_last_used_fini(env, m);
out_proc:
- ptlrpc_lprocfs_unregister_obd(m->opd_obd);
- lprocfs_obd_cleanup(m->opd_obd);
- class_destroy_import(m->opd_obd->u.cli.cl_import);
- client_obd_cleanup(m->opd_obd);
+ ptlrpc_lprocfs_unregister_obd(obd);
+ lprocfs_obd_cleanup(obd);
+ class_destroy_import(obd->u.cli.cl_import);
+ client_obd_cleanup(obd);
out_ref:
ptlrpcd_decref();
out_disconnect:
OBD_CONNECT_REQPORTAL |
OBD_CONNECT_SKIP_ORPHAN |
OBD_CONNECT_VERSION |
- OBD_CONNECT_FID;
+ OBD_CONNECT_FID |
+ OBD_CONNECT_LVB_TYPE;
if (is_osp_on_ost(osp->opd_obd->obd_name))
ocd->ocd_connect_flags |= OBD_CONNECT_LIGHTWEIGHT;
/* Since the request might also come from lprocfs, so we need
* sync this with client_disconnect_export Bug15684 */
- cfs_down_read(&exp->exp_obd->u.cli.cl_sem);
+ down_read(&exp->exp_obd->u.cli.cl_sem);
if (exp->exp_obd->u.cli.cl_import)
imp = class_import_get(exp->exp_obd->u.cli.cl_import);
- cfs_up_read(&exp->exp_obd->u.cli.cl_sem);
+ up_read(&exp->exp_obd->u.cli.cl_sem);
if (!imp)
RETURN(-ENODEV);
ldlm_namespace_cleanup(obd->obd_namespace, LDLM_FL_LOCAL_ONLY);
break;
case IMP_EVENT_OCD:
+ case IMP_EVENT_DEACTIVATE:
+ case IMP_EVENT_ACTIVATE:
break;
default:
CERROR("%s: unsupported import event: %#x\n",
.o_statfs = osp_obd_statfs,
};
+struct llog_operations osp_mds_ost_orig_logops;
+
static int __init osp_mod_init(void)
{
struct lprocfs_static_vars lvars;
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;
+ osp_mds_ost_orig_logops.lop_declare_add = llog_cat_declare_add_rec;
+
osc_proc_dir = lprocfs_srch(proc_lustre_root, "osc");
if (osc_proc_dir == NULL) {
osc_proc_dir = lprocfs_register("osc", proc_lustre_root, NULL,
MODULE_LICENSE("GPL");
cfs_module(osp, LUSTRE_VERSION_STRING, osp_mod_init, osp_mod_exit);
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff