#include <linux/obd_class.h>
#include <linux/random.h>
#include <linux/slab.h>
+#include <linux/lprocfs_status.h>
extern struct list_head obd_types;
kmem_cache_t *obdo_cachep = NULL;
-kmem_cache_t *export_cachep = NULL;
kmem_cache_t *import_cachep = NULL;
+kmem_cache_t *export_cachep = NULL;
+
+int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);
/* I would prefer if these next four functions were in ptlrpc, to be honest,
* but obdclass uses them for the netregression ioctls. -phil */
LASSERT(cbd);
desc = cbd->desc;
- LASSERT(desc);
+ if (!desc) {
+ CERROR("no desc for timed-out BRW, reopen Bugzilla 214!\n");
+ RETURN(0); /* back to sleep -- someone had better wake us up! */
+ }
+
LASSERT(desc->bd_connection);
CERROR("IO of %d pages to/from %s:%d (conn %p) timed out\n",
if (atomic_dec_and_test(&data->refcount))
OBD_FREE(data, sizeof(*data));
if (ret == -EINTR)
- return ret;
+ RETURN(ret);
} else if (phase == CB_PHASE_FINISH) {
data->err = err;
data->complete = 1;
wake_up(&data->waitq);
if (atomic_dec_and_test(&data->refcount))
OBD_FREE(data, sizeof(*data));
- return err;
- } else
+ RETURN(err);
+ } else
LBUG();
EXIT;
return 0;
return type;
}
-int class_register_type(struct obd_ops *ops, char *nm)
+int class_register_type(struct obd_ops *ops, struct lprocfs_vars* vars, char *nm)
{
struct obd_type *type;
+ int rc;
ENTRY;
if (!type)
RETURN(-ENOMEM);
INIT_LIST_HEAD(&type->typ_chain);
+ CDEBUG(D_INFO, "MOD_INC_USE for register_type: count = %d\n",
+ atomic_read(&(THIS_MODULE)->uc.usecount));
MOD_INC_USE_COUNT;
list_add(&type->typ_chain, &obd_types);
memcpy(type->typ_ops, ops, sizeof(*type->typ_ops));
strcpy(type->typ_name, nm);
+ rc = lprocfs_reg_class(type, (lprocfs_vars_t *)vars, (void*)type);
+ if(rc)
+ RETURN(rc);
+
RETURN(0);
}
OBD_FREE(type->typ_ops, sizeof(*type->typ_ops));
RETURN(-EBUSY);
}
+ if(type->typ_procroot)
+ lprocfs_dereg_class(type);
list_del(&type->typ_chain);
OBD_FREE(type->typ_name, strlen(nm) + 1);
if (type->typ_ops != NULL)
OBD_FREE(type->typ_ops, sizeof(*type->typ_ops));
OBD_FREE(type, sizeof(*type));
+ CDEBUG(D_INFO, "MOD_DEC_USE for register_type: count = %d\n",
+ atomic_read(&(THIS_MODULE)->uc.usecount) - 1);
MOD_DEC_USE_COUNT;
RETURN(0);
} /* class_unregister_type */
if (obdo_cachep) {
rc = kmem_cache_destroy(obdo_cachep);
if (rc)
- CERROR("Cannot destory obdo_cachep\n");
+ CERROR("Cannot destory ll_obdo_cache\n");
obdo_cachep = NULL;
}
if (import_cachep) {
rc = kmem_cache_destroy(import_cachep);
if (rc)
- CERROR("Cannot destory import_cachep\n");
+ CERROR("Cannot destory ll_import_cache\n");
import_cachep = NULL;
}
if (export_cachep) {
rc = kmem_cache_destroy(export_cachep);
if (rc)
- CERROR("Cannot destory import_cachep\n");
+ CERROR("Cannot destory ll_export_cache\n");
export_cachep = NULL;
}
EXIT;
int obd_init_caches(void)
{
ENTRY;
- if (obdo_cachep == NULL) {
- obdo_cachep = kmem_cache_create("obdo_cache",
- sizeof(struct obdo),
- 0, SLAB_HWCACHE_ALIGN,
- NULL, NULL);
- if (obdo_cachep == NULL)
- GOTO(out, -ENOMEM);
- }
+ LASSERT(obdo_cachep == NULL);
+ obdo_cachep = kmem_cache_create("ll_obdo_cache", sizeof(struct obdo),
+ 0, 0, NULL, NULL);
+ if (!obdo_cachep)
+ GOTO(out, -ENOMEM);
+
+ LASSERT(export_cachep == NULL);
+ export_cachep = kmem_cache_create("ll_export_cache",
+ sizeof(struct obd_export),
+ 0, 0, NULL, NULL);
+ if (!export_cachep)
+ GOTO(out, -ENOMEM);
+
+ LASSERT(import_cachep == NULL);
+ import_cachep = kmem_cache_create("ll_import_cache",
+ sizeof(struct obd_import),
+ 0, 0, NULL, NULL);
+ if (!import_cachep)
+ GOTO(out, -ENOMEM);
- if (export_cachep == NULL) {
- export_cachep = kmem_cache_create("export_cache",
- sizeof(struct obd_export),
- 0, SLAB_HWCACHE_ALIGN,
- NULL, NULL);
- if (export_cachep == NULL)
- GOTO(out, -ENOMEM);
- }
-
- if (import_cachep == NULL) {
- import_cachep = kmem_cache_create("import_cache",
- sizeof(struct obd_import),
- 0, SLAB_HWCACHE_ALIGN,
- NULL, NULL);
- if (import_cachep == NULL)
- GOTO(out, -ENOMEM);
- }
RETURN(0);
out:
obd_cleanup_caches();
RETURN(NULL);
if (export->exp_cookie != conn->cookie)
- return NULL;
- return export;
+ RETURN(NULL);
+ RETURN(export);
} /* class_conn2export */
struct obd_device *class_conn2obd(struct lustre_handle *conn)
{
ENTRY;
+ LASSERT(exp->exp_cookie != DEAD_HANDLE_MAGIC);
+
spin_lock(&exp->exp_obd->obd_dev_lock);
list_del(&exp->exp_obd_chain);
spin_unlock(&exp->exp_obd->obd_dev_lock);
list_del(&exp->exp_conn_chain);
if (exp->exp_connection) {
spin_unlock(&exp->exp_connection->c_lock);
- //ptlrpc_put_connection(exp->exp_connection);
+ ptlrpc_put_connection_superhack(exp->exp_connection);
}
+ exp->exp_cookie = DEAD_HANDLE_MAGIC;
kmem_cache_free(export_cachep, exp);
EXIT;
if (!export)
return -ENOMEM;
-
conn->addr = (__u64) (unsigned long)export;
conn->cookie = export->exp_cookie;