#include <linux/obd_class.h>
#include <linux/random.h>
#include <linux/slab.h>
+#include <linux/lprocfs_status.h>
extern struct list_head obd_types;
-extern struct obd_device obd_dev[MAX_OBD_DEVICES];
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 */
+static int sync_io_timeout(void *data)
+{
+ struct io_cb_data *cbd = data;
+ struct ptlrpc_bulk_desc *desc;
+ ENTRY;
+
+ LASSERT(cbd);
+ desc = cbd->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",
+ desc->bd_page_count, desc->bd_connection->c_remote_uuid,
+ desc->bd_portal, desc->bd_connection);
+ desc->bd_connection->c_level = LUSTRE_CONN_RECOVD;
+ desc->bd_flags |= PTL_RPC_FL_TIMEOUT;
+ if (desc->bd_connection && class_signal_connection_failure) {
+ class_signal_connection_failure(desc->bd_connection);
+
+ /* We go back to sleep, until we're resumed or interrupted. */
+ RETURN(0);
+ }
+
+ /* If we can't be recovered, just abort the syscall with -ETIMEDOUT. */
+ RETURN(1);
+}
+
+static int sync_io_intr(void *data)
+{
+ struct io_cb_data *cbd = data;
+ struct ptlrpc_bulk_desc *desc = cbd->desc;
+
+ ENTRY;
+ desc->bd_flags |= PTL_RPC_FL_INTR;
+ RETURN(1); /* ignored, as of this writing */
+}
+
+int ll_sync_io_cb(struct io_cb_data *data, int err, int phase)
+{
+ int ret;
+ ENTRY;
+
+ if (phase == CB_PHASE_START) {
+ struct l_wait_info lwi;
+ lwi = LWI_TIMEOUT_INTR(obd_timeout * HZ, sync_io_timeout,
+ sync_io_intr, data);
+ ret = l_wait_event(data->waitq, data->complete, &lwi);
+ if (atomic_dec_and_test(&data->refcount))
+ OBD_FREE(data, sizeof(*data));
+ if (ret == -EINTR)
+ 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
+ LBUG();
+ EXIT;
+ return 0;
+}
+
+struct io_cb_data *ll_init_cb(void)
+{
+ struct io_cb_data *d;
+
+ OBD_ALLOC(d, sizeof(*d));
+ if (d) {
+ init_waitqueue_head(&d->waitq);
+ atomic_set(&d->refcount, 2);
+ }
+ RETURN(d);
+}
/*
* support functions: we could use inter-module communication, but this
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);
}
- CDEBUG(D_IOCTL, "looking for export addr %Lx cookie %Lx\n",
+ CDEBUG(D_IOCTL, "looking for export addr "LPX64" cookie "LPX64"\n",
conn->addr, conn->cookie);
export = (struct obd_export *) (unsigned long)conn->addr;
if (!kmem_cache_validate(export_cachep, (void *)export))
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)
struct obd_export * export;
export = kmem_cache_alloc(export_cachep, GFP_KERNEL);
- if ( !export ) {
+ if (!export) {
CERROR("no memory! (minor %d)\n", obddev->obd_minor);
return NULL;
}
memset(export, 0, sizeof(*export));
- get_random_bytes(&export->exp_cookie, sizeof(__u64));
+ get_random_bytes(&export->exp_cookie, sizeof(export->exp_cookie));
export->exp_obd = obddev;
- /* XXX should these be in MDS and LDLM init functions? */
- INIT_LIST_HEAD(&export->exp_mds_data.med_open_head);
+ /* XXX this should be in LDLM init */
INIT_LIST_HEAD(&export->exp_ldlm_data.led_held_locks);
INIT_LIST_HEAD(&export->exp_conn_chain);
spin_lock(&obddev->obd_dev_lock);
void class_destroy_export(struct obd_export *exp)
{
- int rc;
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);
/* XXXshaver no connection here... */
- if (exp->exp_connection) spin_lock(&exp->exp_connection->c_lock);
+ if (exp->exp_connection)
+ spin_lock(&exp->exp_connection->c_lock);
list_del(&exp->exp_conn_chain);
- if (exp->exp_connection) spin_unlock(&exp->exp_connection->c_lock);
-
- /* XXXshaver these bits want to be hung off the export, instead of
- * XXXshaver hard-coded here.
- */
- if (mds_destroy_export) {
- rc = mds_destroy_export(exp);
- if (rc)
- CERROR("error freeing mds client data: rc = %d\n", rc);
- }
- if (ldlm_destroy_export) {
- rc = ldlm_destroy_export(exp);
- if (rc)
- CERROR("error freeing dlm client data: rc = %d\n", rc);
+ if (exp->exp_connection) {
+ spin_unlock(&exp->exp_connection->c_lock);
+ ptlrpc_put_connection_superhack(exp->exp_connection);
}
+
+ exp->exp_cookie = DEAD_HANDLE_MAGIC;
kmem_cache_free(export_cachep, exp);
EXIT;
/* a connection defines an export context in which preallocation can
be managed. */
-int class_connect (struct lustre_handle *conn, struct obd_device *obd,
- char *cluuid)
+int class_connect(struct lustre_handle *conn, struct obd_device *obd,
+ obd_uuid_t cluuid)
{
struct obd_export * export;
if (conn == NULL) {
if (!export)
return -ENOMEM;
-
conn->addr = (__u64) (unsigned long)export;
conn->cookie = export->exp_cookie;
-
+
CDEBUG(D_IOCTL, "connect: addr %Lx cookie %Lx\n",
(long long)conn->addr, (long long)conn->cookie);
return 0;
if (!(export = class_conn2export(conn))) {
fixme();
CDEBUG(D_IOCTL, "disconnect: attempting to free "
- "nonexistent client %Lx\n", conn->addr);
+ "nonexistent client "LPX64"\n", conn->addr);
RETURN(-EINVAL);
}
for (i = 0; i < obddev->obd_multi_count; i++) {
int rc;
- struct obd_device *obd = class_conn2obd(&obddev->obd_multi_conn[i]);
+ struct obd_device *obd =
+ class_conn2obd(&obddev->obd_multi_conn[i]);
if (!obd) {
CERROR("no such device [i %d]\n", i);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff