#include <lustre_disk.h>
#include <lustre_kernelcomm.h>
-static DEFINE_SPINLOCK(obd_types_lock);
-static LIST_HEAD(obd_types);
DEFINE_RWLOCK(obd_dev_lock);
static struct obd_device *obd_devs[MAX_OBD_DEVICES];
static struct kmem_cache *obd_device_cachep;
-
+static struct kobj_type class_ktype;
static struct workqueue_struct *zombie_wq;
static void obd_zombie_export_add(struct obd_export *exp);
struct obd_type *class_search_type(const char *name)
{
- struct list_head *tmp;
- struct obd_type *type;
+ struct kobject *kobj = kset_find_obj(lustre_kset, name);
- spin_lock(&obd_types_lock);
- list_for_each(tmp, &obd_types) {
- type = list_entry(tmp, struct obd_type, typ_chain);
- if (strcmp(type->typ_name, name) == 0) {
- spin_unlock(&obd_types_lock);
- return type;
- }
- }
- spin_unlock(&obd_types_lock);
+ if (kobj && kobj->ktype == &class_ktype)
+ return container_of(kobj, struct obd_type, typ_kobj);
+
+ kobject_put(kobj);
return NULL;
}
EXPORT_SYMBOL(class_search_type);
struct obd_type *class_get_type(const char *name)
{
- struct obd_type *type = class_search_type(name);
+ struct obd_type *type;
+ type = class_search_type(name);
#ifdef HAVE_MODULE_LOADING_SUPPORT
if (!type) {
const char *modname = name;
+#ifdef HAVE_SERVER_SUPPORT
if (strcmp(modname, "obdfilter") == 0)
modname = "ofd";
if (!strncmp(modname, LUSTRE_MDS_NAME, strlen(LUSTRE_MDS_NAME)))
modname = LUSTRE_MDT_NAME;
+#endif /* HAVE_SERVER_SUPPORT */
if (!request_module("%s", modname)) {
CDEBUG(D_INFO, "Loaded module '%s'\n", modname);
}
#endif
if (type) {
- spin_lock(&type->obd_type_lock);
- type->typ_refcnt++;
- try_module_get(type->typ_dt_ops->o_owner);
- spin_unlock(&type->obd_type_lock);
+ if (try_module_get(type->typ_dt_ops->o_owner)) {
+ atomic_inc(&type->typ_refcnt);
+ /* class_search_type() returned a counted reference,
+ * but we don't need that count any more as
+ * we have one through typ_refcnt.
+ */
+ kobject_put(&type->typ_kobj);
+ } else {
+ kobject_put(&type->typ_kobj);
+ type = NULL;
+ }
}
return type;
}
void class_put_type(struct obd_type *type)
{
LASSERT(type);
- spin_lock(&type->obd_type_lock);
- type->typ_refcnt--;
module_put(type->typ_dt_ops->o_owner);
- spin_unlock(&type->obd_type_lock);
+ atomic_dec(&type->typ_refcnt);
}
static void class_sysfs_release(struct kobject *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);
+ if (type->typ_name && 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)
{
struct dentry *symlink;
struct obd_type *type;
- struct kobject *kobj;
int rc;
- kobj = kset_find_obj(lustre_kset, name);
- if (kobj) {
- kobject_put(kobj);
+ type = class_search_type(name);
+ if (type) {
+ kobject_put(&type->typ_kobj);
return ERR_PTR(-EEXIST);
}
if (!type)
return ERR_PTR(-ENOMEM);
- 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);
/* sanity check */
LASSERT(strnlen(name, CLASS_MAX_NAME) < CLASS_MAX_NAME);
- if (class_search_type(name)) {
+ type = class_search_type(name);
+ if (type) {
#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;
- }
- }
+ if (type->typ_sym_filter)
+ goto dir_exist;
#endif /* HAVE_SERVER_SUPPORT */
+ kobject_put(&type->typ_kobj);
CDEBUG(D_IOCTL, "Type %s already registered\n", name);
RETURN(-EEXIST);
}
if (type == NULL)
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
#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)
+ type->typ_md_ops == NULL)
GOTO (failed, rc = -ENOMEM);
*(type->typ_dt_ops) = *dt_ops;
/* md_ops is optional */
if (md_ops)
*(type->typ_md_ops) = *md_ops;
- strcpy(type->typ_name, name);
- spin_lock_init(&type->obd_type_lock);
#ifdef HAVE_SERVER_SUPPORT
- if (type->typ_sym_filter)
+ if (type->typ_sym_filter) {
+ type->typ_sym_filter = false;
+ kobject_put(&type->typ_kobj);
goto setup_ldt;
+ }
#endif
#ifdef CONFIG_PROC_FS
if (enable_proc && !type->typ_procroot) {
- type->typ_procroot = lprocfs_register(type->typ_name,
+ type->typ_procroot = lprocfs_register(name,
proc_lustre_root,
NULL, type);
if (IS_ERR(type->typ_procroot)) {
GOTO(failed, rc);
}
- spin_lock(&obd_types_lock);
- list_add(&type->typ_chain, &obd_types);
- spin_unlock(&obd_types_lock);
-
RETURN(0);
failed:
int class_unregister_type(const char *name)
{
struct obd_type *type = class_search_type(name);
+ int rc = 0;
ENTRY;
if (!type) {
RETURN(-EINVAL);
}
- if (type->typ_refcnt) {
- CERROR("type %s has refcount (%d)\n", name, type->typ_refcnt);
+ if (atomic_read(&type->typ_refcnt)) {
+ CERROR("type %s has refcount (%d)\n", name,
+ atomic_read(&type->typ_refcnt));
/* This is a bad situation, let's make the best of it */
/* Remove ops, but leave the name for debugging */
OBD_FREE_PTR(type->typ_dt_ops);
OBD_FREE_PTR(type->typ_md_ops);
- RETURN(-EBUSY);
+ GOTO(out_put, rc = -EBUSY);
}
+ /* Put the final ref */
+ kobject_put(&type->typ_kobj);
+out_put:
+ /* Put the ref returned by class_search_type() */
kobject_put(&type->typ_kobj);
- RETURN(0);
+ RETURN(rc);
} /* class_unregister_type */
EXPORT_SYMBOL(class_unregister_type);
atomic_read(&obd->obd_refcount));
}
read_unlock(&obd_dev_lock);
- return;
}
/* Search for a client OBD connected to tgt_uuid. If grp_uuid is
specified, then only the client with that uuid is returned,
otherwise any client connected to the tgt is returned. */
struct obd_device * class_find_client_obd(struct obd_uuid *tgt_uuid,
- const char * typ_name,
+ const char *type_name,
struct obd_uuid *grp_uuid)
{
int i;
if (obd == NULL)
continue;
- if ((strncmp(obd->obd_type->typ_name, typ_name,
- strlen(typ_name)) == 0)) {
+ if ((strncmp(obd->obd_type->typ_name, type_name,
+ strlen(type_name)) == 0)) {
if (obd_uuid_equals(tgt_uuid,
&obd->u.cli.cl_target_uuid) &&
((grp_uuid)? obd_uuid_equals(grp_uuid,
ENTRY;
LASSERT(obd_device_cachep == NULL);
- obd_device_cachep = kmem_cache_create("ll_obd_dev_cache",
- sizeof(struct obd_device),
- 0, 0, NULL);
+ obd_device_cachep = kmem_cache_create_usercopy("ll_obd_dev_cache",
+ sizeof(struct obd_device),
+ 0, 0, 0, sizeof(struct obd_device), NULL);
if (!obd_device_cachep)
GOTO(out, rc = -ENOMEM);
RETURN(rc);
}
+static struct portals_handle_ops export_handle_ops;
+
/* map connection to client */
struct obd_export *class_conn2export(struct lustre_handle *conn)
{
}
CDEBUG(D_INFO, "looking for export cookie %#llx\n", conn->cookie);
- export = class_handle2object(conn->cookie, NULL);
+ export = class_handle2object(conn->cookie, &export_handle_ops);
RETURN(export);
}
EXPORT_SYMBOL(class_conn2export);
struct obd_device *obd = exp->exp_obd;
ENTRY;
- LASSERT_ATOMIC_ZERO(&exp->exp_refcount);
+ LASSERT(refcount_read(&exp->exp_handle.h_ref) == 0);
LASSERT(obd != NULL);
CDEBUG(D_IOCTL, "destroying export %p/%s for %s\n", exp,
EXIT;
}
-static void export_handle_addref(void *export)
-{
- class_export_get(export);
-}
-
static struct portals_handle_ops export_handle_ops = {
- .hop_addref = export_handle_addref,
.hop_free = NULL,
+ .hop_type = "export",
};
struct obd_export *class_export_get(struct obd_export *exp)
{
- atomic_inc(&exp->exp_refcount);
- CDEBUG(D_INFO, "GETting export %p : new refcount %d\n", exp,
- atomic_read(&exp->exp_refcount));
+ refcount_inc(&exp->exp_handle.h_ref);
+ CDEBUG(D_INFO, "GET export %p refcount=%d\n", exp,
+ refcount_read(&exp->exp_handle.h_ref));
return exp;
}
EXPORT_SYMBOL(class_export_get);
void class_export_put(struct obd_export *exp)
{
LASSERT(exp != NULL);
- LASSERT_ATOMIC_GT_LT(&exp->exp_refcount, 0, LI_POISON);
+ LASSERT(refcount_read(&exp->exp_handle.h_ref) > 0);
+ LASSERT(refcount_read(&exp->exp_handle.h_ref) < LI_POISON);
CDEBUG(D_INFO, "PUTting export %p : new refcount %d\n", exp,
- atomic_read(&exp->exp_refcount) - 1);
+ refcount_read(&exp->exp_handle.h_ref) - 1);
- if (atomic_dec_and_test(&exp->exp_refcount)) {
+ if (refcount_dec_and_test(&exp->exp_handle.h_ref)) {
struct obd_device *obd = exp->exp_obd;
CDEBUG(D_IOCTL, "final put %p/%s\n",
export->exp_lock_hash = NULL;
export->exp_flock_hash = NULL;
/* 2 = class_handle_hash + last */
- atomic_set(&export->exp_refcount, 2);
+ refcount_set(&export->exp_handle.h_ref, 2);
atomic_set(&export->exp_rpc_count, 0);
atomic_set(&export->exp_cb_count, 0);
atomic_set(&export->exp_locks_count, 0);
CDEBUG(debug_level, "%s: %s %p %s %s %d (%d %d %d) %d %d %d %d: "
"%p %s %llu stale:%d\n",
exp->exp_obd->obd_name, status, exp, exp->exp_client_uuid.uuid,
- obd_export_nid2str(exp), atomic_read(&exp->exp_refcount),
+ obd_export_nid2str(exp),
+ refcount_read(&exp->exp_handle.h_ref),
atomic_read(&exp->exp_rpc_count),
atomic_read(&exp->exp_cb_count),
atomic_read(&exp->exp_locks_count),
__u32 old;
int diff;
int i;
- char *typ_name;
+ const char *type_name;
int rc;
if (max > OBD_MAX_RIF_MAX || max < 1)
return -ERANGE;
- typ_name = cli->cl_import->imp_obd->obd_type->typ_name;
- if (strcmp(typ_name, LUSTRE_MDC_NAME) == 0) {
+ type_name = cli->cl_import->imp_obd->obd_type->typ_name;
+ if (strcmp(type_name, LUSTRE_MDC_NAME) == 0) {
/* adjust max_mod_rpcs_in_flight to ensure it is always
* strictly lower that max_rpcs_in_flight */
if (max < 2) {
__u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc,
struct lookup_intent *it)
{
- struct l_wait_info lwi = LWI_INTR(NULL, NULL);
bool close_req = false;
__u16 i, max;
LASSERT(!test_and_set_bit(i, cli->cl_mod_tag_bitmap));
spin_unlock(&cli->cl_mod_rpcs_lock);
/* tag 0 is reserved for non-modify RPCs */
+
+ CDEBUG(D_RPCTRACE, "%s: modify RPC slot %u is allocated"
+ "opc %u, max %hu\n",
+ cli->cl_import->imp_obd->obd_name,
+ i + 1, opc, max);
+
return i + 1;
}
spin_unlock(&cli->cl_mod_rpcs_lock);
"opc %u, max %hu\n",
cli->cl_import->imp_obd->obd_name, opc, max);
- l_wait_event_exclusive(cli->cl_mod_rpcs_waitq,
- obd_mod_rpc_slot_avail(cli, close_req),
- &lwi);
+ wait_event_idle_exclusive(cli->cl_mod_rpcs_waitq,
+ obd_mod_rpc_slot_avail(cli,
+ close_req));
} while (true);
}
EXPORT_SYMBOL(obd_get_mod_rpc_slot);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff