static void class_sysfs_release(struct kobject *kobj)
{
- OBD_FREE(kobj, sizeof(*kobj));
+ struct obd_type *type = container_of(kobj, struct obd_type, typ_kobj);
+
+#ifdef HAVE_SERVER_SUPPORT
+ if (type->typ_sym_filter)
+ type->typ_debugfs_entry = NULL;
+#endif
+ debugfs_remove_recursive(type->typ_debugfs_entry);
+ type->typ_debugfs_entry = NULL;
+
+ if (type->typ_lu)
+ lu_device_type_fini(type->typ_lu);
+
+ spin_lock(&obd_types_lock);
+ list_del(&type->typ_chain);
+ spin_unlock(&obd_types_lock);
+
+ if (type->typ_name) {
+#ifdef CONFIG_PROC_FS
+ if (type->typ_procroot)
+ remove_proc_subtree(type->typ_name, proc_lustre_root);
+#endif
+ OBD_FREE(type->typ_name, strlen(type->typ_name) + 1);
+ }
+ if (type->typ_md_ops)
+ OBD_FREE_PTR(type->typ_md_ops);
+ if (type->typ_dt_ops)
+ OBD_FREE_PTR(type->typ_dt_ops);
+
+ OBD_FREE(type, sizeof(*type));
}
static struct kobj_type class_ktype = {
.release = class_sysfs_release,
};
-struct kobject *class_setup_tunables(const char *name)
+#ifdef HAVE_SERVER_SUPPORT
+struct obd_type *class_add_symlinks(const char *name, bool enable_proc)
{
+ struct dentry *symlink;
+ struct obd_type *type;
struct kobject *kobj;
int rc;
-#ifdef HAVE_SERVER_SUPPORT
kobj = kset_find_obj(lustre_kset, name);
- if (kobj)
- return kobj;
-#endif
- OBD_ALLOC(kobj, sizeof(*kobj));
- if (!kobj)
+ if (kobj) {
+ kobject_put(kobj);
+ return ERR_PTR(-EEXIST);
+ }
+
+ OBD_ALLOC(type, sizeof(*type));
+ if (!type)
return ERR_PTR(-ENOMEM);
- kobj->kset = lustre_kset;
- kobject_init(kobj, &class_ktype);
- rc = kobject_add(kobj, &lustre_kset->kobj, "%s", name);
- if (rc) {
- kobject_put(kobj);
+ INIT_LIST_HEAD(&type->typ_chain);
+
+ type->typ_kobj.kset = lustre_kset;
+ rc = kobject_init_and_add(&type->typ_kobj, &class_ktype,
+ &lustre_kset->kobj, "%s", name);
+ if (rc)
+ return ERR_PTR(rc);
+
+ symlink = debugfs_create_dir(name, debugfs_lustre_root);
+ if (IS_ERR_OR_NULL(symlink)) {
+ rc = symlink ? PTR_ERR(symlink) : -ENOMEM;
+ kobject_put(&type->typ_kobj);
return ERR_PTR(rc);
}
- return kobj;
+ type->typ_debugfs_entry = symlink;
+ type->typ_sym_filter = true;
+
+ if (enable_proc) {
+ type->typ_procroot = lprocfs_register(name, proc_lustre_root,
+ NULL, NULL);
+ if (IS_ERR(type->typ_procroot)) {
+ CERROR("%s: can't create compat proc entry: %d\n",
+ name, (int)PTR_ERR(type->typ_procroot));
+ type->typ_procroot = NULL;
+ }
+ }
+
+ return type;
}
-EXPORT_SYMBOL(class_setup_tunables);
+EXPORT_SYMBOL(class_add_symlinks);
+#endif /* HAVE_SERVER_SUPPORT */
#define CLASS_MAX_NAME 1024
const char *name, struct lu_device_type *ldt)
{
struct obd_type *type;
-#ifdef HAVE_SERVER_SUPPORT
- struct qstr dname;
-#endif /* HAVE_SERVER_SUPPORT */
- int rc = 0;
+ int rc;
ENTRY;
/* sanity check */
LASSERT(strnlen(name, CLASS_MAX_NAME) < CLASS_MAX_NAME);
if (class_search_type(name)) {
+#ifdef HAVE_SERVER_SUPPORT
+ if (strcmp(name, LUSTRE_LOV_NAME) == 0 ||
+ strcmp(name, LUSTRE_OSC_NAME) == 0) {
+ struct kobject *kobj;
+
+ kobj = kset_find_obj(lustre_kset, name);
+ if (kobj) {
+ type = container_of(kobj, struct obd_type,
+ typ_kobj);
+ goto dir_exist;
+ }
+ }
+#endif /* HAVE_SERVER_SUPPORT */
CDEBUG(D_IOCTL, "Type %s already registered\n", name);
RETURN(-EEXIST);
}
- rc = -ENOMEM;
OBD_ALLOC(type, sizeof(*type));
if (type == NULL)
- RETURN(rc);
+ RETURN(-ENOMEM);
+ INIT_LIST_HEAD(&type->typ_chain);
+ type->typ_kobj.kset = lustre_kset;
+ kobject_init(&type->typ_kobj, &class_ktype);
+#ifdef HAVE_SERVER_SUPPORT
+dir_exist:
+#endif /* HAVE_SERVER_SUPPORT */
OBD_ALLOC_PTR(type->typ_dt_ops);
OBD_ALLOC_PTR(type->typ_md_ops);
OBD_ALLOC(type->typ_name, strlen(name) + 1);
if (type->typ_dt_ops == NULL ||
type->typ_md_ops == NULL ||
type->typ_name == NULL)
- GOTO (failed, rc);
+ GOTO (failed, rc = -ENOMEM);
*(type->typ_dt_ops) = *dt_ops;
/* md_ops is optional */
strcpy(type->typ_name, name);
spin_lock_init(&type->obd_type_lock);
+#ifdef HAVE_SERVER_SUPPORT
+ if (type->typ_sym_filter)
+ goto setup_ldt;
+#endif
#ifdef CONFIG_PROC_FS
- if (enable_proc) {
+ if (enable_proc && !type->typ_procroot) {
type->typ_procroot = lprocfs_register(type->typ_name,
proc_lustre_root,
- vars, type);
+ NULL, type);
if (IS_ERR(type->typ_procroot)) {
rc = PTR_ERR(type->typ_procroot);
type->typ_procroot = NULL;
}
}
#endif
-#ifdef HAVE_SERVER_SUPPORT
- dname.name = name;
- dname.len = strlen(dname.name);
- dname.hash = ll_full_name_hash(debugfs_lustre_root, dname.name,
- dname.len);
- type->typ_debugfs_entry = d_lookup(debugfs_lustre_root, &dname);
- if (type->typ_debugfs_entry) {
- dput(type->typ_debugfs_entry);
- type->typ_sym_filter = true;
- goto dir_exist;
- }
-#endif /* HAVE_SERVER_SUPPORT */
-
- type->typ_debugfs_entry = ldebugfs_register(type->typ_name,
- debugfs_lustre_root,
- NULL, type);
+ type->typ_debugfs_entry = ldebugfs_register(name, debugfs_lustre_root,
+ vars, type);
if (IS_ERR_OR_NULL(type->typ_debugfs_entry)) {
rc = type->typ_debugfs_entry ? PTR_ERR(type->typ_debugfs_entry)
: -ENOMEM;
type->typ_debugfs_entry = NULL;
GOTO(failed, rc);
}
+
+ rc = kobject_add(&type->typ_kobj, &lustre_kset->kobj, "%s", name);
+ if (rc)
+ GOTO(failed, rc);
#ifdef HAVE_SERVER_SUPPORT
-dir_exist:
+setup_ldt:
#endif
- type->typ_kobj = class_setup_tunables(type->typ_name);
- if (IS_ERR(type->typ_kobj))
- GOTO(failed, rc = PTR_ERR(type->typ_kobj));
-
if (ldt) {
type->typ_lu = ldt;
rc = lu_device_type_init(ldt);
- if (rc) {
- kobject_put(type->typ_kobj);
+ if (rc)
GOTO(failed, rc);
- }
}
spin_lock(&obd_types_lock);
RETURN(0);
failed:
-#ifdef HAVE_SERVER_SUPPORT
- if (type->typ_sym_filter)
- type->typ_debugfs_entry = NULL;
-#endif
- if (!IS_ERR_OR_NULL(type->typ_debugfs_entry))
- ldebugfs_remove(&type->typ_debugfs_entry);
- if (type->typ_name != NULL) {
-#ifdef CONFIG_PROC_FS
- if (type->typ_procroot != NULL)
- remove_proc_subtree(type->typ_name, proc_lustre_root);
-#endif
- OBD_FREE(type->typ_name, strlen(name) + 1);
- }
- if (type->typ_md_ops != NULL)
- OBD_FREE_PTR(type->typ_md_ops);
- if (type->typ_dt_ops != NULL)
- OBD_FREE_PTR(type->typ_dt_ops);
- OBD_FREE(type, sizeof(*type));
- RETURN(rc);
+ kobject_put(&type->typ_kobj);
+
+ RETURN(rc);
}
EXPORT_SYMBOL(class_register_type);
RETURN(-EBUSY);
}
- kobject_put(type->typ_kobj);
+ kobject_put(&type->typ_kobj);
- /* we do not use type->typ_procroot as for compatibility purposes
- * other modules can share names (i.e. lod can use lov entry). so
- * we can't reference pointer as it can get invalided when another
- * module removes the entry */
-#ifdef CONFIG_PROC_FS
- if (type->typ_procroot != NULL)
- remove_proc_subtree(type->typ_name, proc_lustre_root);
- if (type->typ_procsym != NULL)
- lprocfs_remove(&type->typ_procsym);
-#endif
-#ifdef HAVE_SERVER_SUPPORT
- if (type->typ_sym_filter)
- type->typ_debugfs_entry = NULL;
-#endif
- if (!IS_ERR_OR_NULL(type->typ_debugfs_entry))
- ldebugfs_remove(&type->typ_debugfs_entry);
-
- if (type->typ_lu)
- lu_device_type_fini(type->typ_lu);
-
- spin_lock(&obd_types_lock);
- list_del(&type->typ_chain);
- spin_unlock(&obd_types_lock);
- OBD_FREE(type->typ_name, strlen(name) + 1);
- if (type->typ_dt_ops != NULL)
- OBD_FREE_PTR(type->typ_dt_ops);
- if (type->typ_md_ops != NULL)
- OBD_FREE_PTR(type->typ_md_ops);
- OBD_FREE(type, sizeof(*type));
- RETURN(0);
+ RETURN(0);
} /* class_unregister_type */
EXPORT_SYMBOL(class_unregister_type);
newdev->obd_conn_inprogress = 0;
- strncpy(newdev->obd_uuid.uuid, uuid, strlen(uuid));
+ strncpy(newdev->obd_uuid.uuid, uuid, UUID_MAX);
CDEBUG(D_IOCTL, "Allocate new device %s (%p)\n",
newdev->obd_name, newdev);
}
EXPORT_SYMBOL(class_exp2obd);
-struct obd_device *class_conn2obd(struct lustre_handle *conn)
-{
- struct obd_export *export;
- export = class_conn2export(conn);
- if (export) {
- struct obd_device *obd = export->exp_obd;
- class_export_put(export);
- return obd;
- }
- return NULL;
-}
-
struct obd_import *class_exp2cliimp(struct obd_export *exp)
{
struct obd_device *obd = exp->exp_obd;
}
EXPORT_SYMBOL(class_exp2cliimp);
-struct obd_import *class_conn2cliimp(struct lustre_handle *conn)
-{
- struct obd_device *obd = class_conn2obd(conn);
- if (obd == NULL)
- return NULL;
- return obd->u.cli.cl_import;
-}
-
/* Export management functions */
static void class_export_destroy(struct obd_export *exp)
{
spin_lock_init(&export->exp_uncommitted_replies_lock);
INIT_LIST_HEAD(&export->exp_uncommitted_replies);
INIT_LIST_HEAD(&export->exp_req_replay_queue);
- INIT_LIST_HEAD(&export->exp_handle.h_link);
+ INIT_LIST_HEAD_RCU(&export->exp_handle.h_link);
INIT_LIST_HEAD(&export->exp_hp_rpcs);
INIT_LIST_HEAD(&export->exp_reg_rpcs);
class_handle_hash(&export->exp_handle, &export_handle_ops);
EXPORT_SYMBOL(class_unlink_export);
/* Import management functions */
-static void class_import_destroy(struct obd_import *imp)
+static void obd_zombie_import_free(struct obd_import *imp)
{
ENTRY;
LASSERT(imp->imp_sec == NULL);
class_decref(imp->imp_obd, "import", imp);
- OBD_FREE_RCU(imp, sizeof(*imp), &imp->imp_handle);
- EXIT;
-}
-
-static void import_handle_addref(void *import)
-{
- class_import_get(import);
+ OBD_FREE_PTR(imp);
+ EXIT;
}
-static struct portals_handle_ops import_handle_ops = {
- .hop_addref = import_handle_addref,
- .hop_free = NULL,
-};
-
struct obd_import *class_import_get(struct obd_import *import)
{
atomic_inc(&import->imp_refcount);
struct obd_import *import;
import = container_of(ws, struct obd_import, imp_zombie_work);
- class_import_destroy(import);
+ obd_zombie_import_free(import);
}
struct obd_import *class_new_import(struct obd_device *obd)
atomic_set(&imp->imp_replay_inflight, 0);
atomic_set(&imp->imp_inval_count, 0);
INIT_LIST_HEAD(&imp->imp_conn_list);
- INIT_LIST_HEAD(&imp->imp_handle.h_link);
- class_handle_hash(&imp->imp_handle, &import_handle_ops);
init_imp_at(&imp->imp_at);
/* the default magic is V2, will be used in connect RPC, and
LASSERT(import != NULL);
LASSERT(import != LP_POISON);
- class_handle_unhash(&import->imp_handle);
-
spin_lock(&import->imp_lock);
import->imp_generation++;
spin_unlock(&import->imp_lock);
}
EXPORT_SYMBOL(obd_set_max_mod_rpcs_in_flight);
-
-#define pct(a, b) (b ? a * 100 / b : 0)
int obd_mod_rpc_stats_seq_show(struct client_obd *cli,
struct seq_file *seq)
{
for (i = 0; i < OBD_HIST_MAX; i++) {
unsigned long mod = cli->cl_mod_rpcs_hist.oh_buckets[i];
mod_cum += mod;
- seq_printf(seq, "%d:\t\t%10lu %3lu %3lu\n",
+ seq_printf(seq, "%d:\t\t%10lu %3u %3u\n",
i, mod, pct(mod, mod_tot),
pct(mod_cum, mod_tot));
if (mod_cum == mod_tot)
return 0;
}
EXPORT_SYMBOL(obd_mod_rpc_stats_seq_show);
-#undef pct
-
/* The number of modify RPCs sent in parallel is limited
* because the server has a finite number of slots per client to
"opc %u, max %hu\n",
cli->cl_import->imp_obd->obd_name, opc, max);
- l_wait_event(cli->cl_mod_rpcs_waitq,
- obd_mod_rpc_slot_avail(cli, close_req), &lwi);
+ l_wait_event_exclusive(cli->cl_mod_rpcs_waitq,
+ obd_mod_rpc_slot_avail(cli, close_req),
+ &lwi);
} while (true);
}
EXPORT_SYMBOL(obd_get_mod_rpc_slot);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff