#include <linux/init.h>
#include <linux/list.h>
#include <asm/io.h>
+#include <asm/ioctls.h>
#include <asm/system.h>
#include <asm/poll.h>
#include <asm/uaccess.h>
#include <linux/obd_class.h>
#include <linux/lustre_debug.h>
#include <linux/smp_lock.h>
+#include <linux/lprocfs_status.h>
struct semaphore obd_conf_sem; /* serialize configuration commands */
struct obd_device obd_dev[MAX_OBD_DEVICES];
ENTRY;
file->private_data = NULL;
+ CDEBUG(D_IOCTL, "MOD_INC_USE for open: count = %d\n",
+ atomic_read(&(THIS_MODULE)->uc.usecount));
MOD_INC_USE_COUNT;
RETURN(0);
}
{
ENTRY;
+ // XXX drop lsm, connections here
if (file->private_data)
file->private_data = NULL;
+ CDEBUG(D_IOCTL, "MOD_DEC_USE for close: count = %d\n",
+ atomic_read(&(THIS_MODULE)->uc.usecount) - 1);
MOD_DEC_USE_COUNT;
RETURN(0);
}
data->ioc_cookie = conn->cookie;
}
+static void forcibly_detach_exports(struct obd_device *obd)
+{
+ int rc;
+ struct list_head *tmp, *n;
+ struct lustre_handle fake_conn;
+
+ CDEBUG(D_IOCTL, "OBD device %d (%p) has exports, "
+ "disconnecting them", obd->obd_minor, obd);
+ list_for_each_safe(tmp, n, &obd->obd_exports) {
+ struct obd_export *exp = list_entry(tmp, struct obd_export,
+ exp_obd_chain);
+ fake_conn.addr = (__u64)(unsigned long)exp;
+ fake_conn.cookie = exp->exp_cookie;
+ rc = obd_disconnect(&fake_conn);
+ if (rc) {
+ CDEBUG(D_IOCTL, "disconnecting export %p failed: %d\n",
+ exp, rc);
+ } else {
+ CDEBUG(D_IOCTL, "export %p disconnected\n", exp);
+ }
+ }
+}
/* to control /dev/obd */
static int obd_class_ioctl (struct inode * inode, struct file * filp,
int len = 0;
struct obd_ioctl_data *data;
struct obd_device *obd = filp->private_data;
-
+
struct lustre_handle conn;
int rw = OBD_BRW_READ;
int err = 0;
int serialised = 0;
+
ENTRY;
switch (cmd)
serialised = 1;
break;
}
-
+
if (!obd && cmd != OBD_IOC_DEVICE && cmd != TCGETS &&
cmd != OBD_IOC_LIST &&
cmd != OBD_IOC_NAME2DEV && cmd != OBD_IOC_NEWDEV) {
}
}
- err = copy_to_user((int *)arg, data, len);
+ err = copy_to_user((void *)arg, data, len);
GOTO(out, err);
}
CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1,
dev);
- err = copy_to_user((int *)arg, data, sizeof(*data));
+ err = copy_to_user((void *)arg, data, sizeof(*data));
GOTO(out, err);
}
CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1,
dev);
- err = copy_to_user((int *)arg, data, sizeof(*data));
+ err = copy_to_user((void *)arg, data, sizeof(*data));
GOTO(out, err);
}
if (dev == -1)
GOTO(out, err=-EINVAL);
- err = copy_to_user((int *)arg, data, sizeof(*data));
+ err = copy_to_user((void *)arg, data, sizeof(*data));
GOTO(out, err);
}
INIT_LIST_HEAD(&obd->obd_imports);
spin_lock_init(&obd->obd_dev_lock);
- /* do the attach */
- if (OBP(obd, attach))
- err = OBP(obd,attach)(obd, sizeof(*data), data);
- if (err) {
- obd->obd_type = NULL;
- } else {
- obd->obd_flags |= OBD_ATTACHED;
-
- type->typ_refcnt++;
- CDEBUG(D_IOCTL, "OBD: dev %d attached type %s\n",
- obd->obd_minor, data->ioc_inlbuf1);
if (data->ioc_inlbuf2) {
int len = strlen(data->ioc_inlbuf2) + 1;
OBD_ALLOC(obd->obd_name, len);
LBUG();
}
memcpy(obd->obd_name, data->ioc_inlbuf2, len);
- obd->obd_proc_entry =
- proc_lustre_register_obd_device(obd);
} else {
CERROR("WARNING: unnamed obd device\n");
- obd->obd_proc_entry = NULL;
}
-
if (data->ioc_inlbuf3) {
int len = strlen(data->ioc_inlbuf3);
if (len >= sizeof(obd->obd_uuid)) {
}
memcpy(obd->obd_uuid, data->ioc_inlbuf3, len);
}
+ /* do the attach */
+ if (OBP(obd, attach))
+ err = OBP(obd,attach)(obd, sizeof(*data), data);
+ if (err) {
+ if(data->ioc_inlbuf2)
+ OBD_FREE(obd->obd_name, strlen(obd->obd_name)+1);
+ obd->obd_type = NULL;
+
+ } else {
+ obd->obd_flags |= OBD_ATTACHED;
+
+ type->typ_refcnt++;
+ CDEBUG(D_IOCTL, "OBD: dev %d attached type %s\n",
+ obd->obd_minor, data->ioc_inlbuf1);
+
+ CDEBUG(D_IOCTL, "MOD_INC_USE for attach: count = %d\n",
+ atomic_read(&(THIS_MODULE)->uc.usecount));
MOD_INC_USE_COUNT;
}
CERROR("OBD device %d not attached\n", obd->obd_minor);
GOTO(out, err=-ENODEV);
}
-#warning FIXME: Mike, we probably need some sort of "force detach" here
- if (!list_empty(&obd->obd_exports) ) {
- CERROR("OBD device %d (%p) has exports\n",
- obd->obd_minor, obd);
- GOTO(out, err=-EBUSY);
+ if (!list_empty(&obd->obd_exports)) {
+ if (!data->ioc_inlbuf1 || data->ioc_inlbuf1[0] != 'F') {
+ CERROR("OBD device %d (%p) has exports\n",
+ obd->obd_minor, obd);
+ GOTO(out, err=-EBUSY);
+ }
+ forcibly_detach_exports(obd);
}
+ if (OBP(obd, detach))
+ err=OBP(obd,detach)(obd);
if (obd->obd_name) {
OBD_FREE(obd->obd_name, strlen(obd->obd_name)+1);
obd->obd_name = NULL;
}
- if (obd->obd_proc_entry)
- proc_lustre_release_obd_device(obd);
-
obd->obd_flags &= ~OBD_ATTACHED;
obd->obd_type->typ_refcnt--;
obd->obd_type = NULL;
+ CDEBUG(D_IOCTL, "MOD_DEC_USE for detach: count = %d\n",
+ atomic_read(&(THIS_MODULE)->uc.usecount) - 1);
MOD_DEC_USE_COUNT;
- GOTO(out, err=0);
+ GOTO(out, err = 0);
}
case OBD_IOC_SETUP: {
char * cluuid = "OBD_CLASS_UUID";
obd_data2conn(&conn, data);
- err = obd_connect(&conn, obd, cluuid);
+ err = obd_connect(&conn, obd, cluuid, NULL, NULL);
- CDEBUG(D_IOCTL, "assigned export %Lx\n", conn.addr);
+ CDEBUG(D_IOCTL, "assigned export "LPX64"\n", conn.addr);
obd_conn2data(data, &conn);
if (err)
GOTO(out, err);
- err = copy_to_user((int *)arg, data, sizeof(*data));
+ err = copy_to_user((void *)arg, data, sizeof(*data));
+ // XXX save connection data into file handle
GOTO(out, err);
}
}
case OBD_IOC_DEC_USE_COUNT: {
+ CDEBUG(D_IOCTL, "MOD_DEC_USE for force dec: count = %d\n",
+ atomic_read(&(THIS_MODULE)->uc.usecount) - 1);
MOD_DEC_USE_COUNT;
GOTO(out, err=0);
}
case OBD_IOC_CREATE: {
- struct lov_stripe_md *ea = NULL;
+ struct lov_stripe_md *lsm = NULL;
obd_data2conn(&conn, data);
-
- err = obd_create(&conn, &data->ioc_obdo1, &ea);
- if (err)
- GOTO(out, err);
-
- err = copy_to_user((int *)arg, data, sizeof(*data));
+#warning FIXME: save lsm into file handle for other ops, release on close
+ err = obd_create(&conn, &data->ioc_obdo1, &lsm);
+ if (!err)
+ err = copy_to_user((void *)arg, data, sizeof(*data));
GOTO(out, err);
}
obd_data2conn(&conn, data);
err = obd_getattr(&conn, &data->ioc_obdo1, NULL);
- if (err)
- GOTO(out, err);
-
- err = copy_to_user((int *)arg, data, sizeof(*data));
+ if (!err)
+ err = copy_to_user((void *)arg, data, sizeof(*data));
GOTO(out, err);
}
case OBD_IOC_SETATTR: {
obd_data2conn(&conn, data);
err = obd_setattr(&conn, &data->ioc_obdo1, NULL);
- if (err)
- GOTO(out, err);
-
- err = copy_to_user((int *)arg, data, sizeof(*data));
+ if (!err)
+ err = copy_to_user((void *)arg, data, sizeof(*data));
GOTO(out, err);
}
obd_data2conn(&conn, data);
err = obd_destroy(&conn, &data->ioc_obdo1, NULL);
- if (err)
- GOTO(out, err);
+ if (!err)
+ err = copy_to_user((void *)arg, data, sizeof(*data));
+ GOTO(out, err);
+ }
+
+ case OBD_IOC_OPEN: {
+ struct lov_stripe_md *lsm = NULL; // XXX fill in from create
- err = copy_to_user((int *)arg, data, sizeof(*data));
+ obd_data2conn(&conn, data);
+ err = obd_open(&conn, &data->ioc_obdo1, lsm);
+ if (!err)
+ err = copy_to_user((void *)arg, data, sizeof(*data));
+ GOTO(out, err);
+ }
+
+ case OBD_IOC_CLOSE: {
+ struct lov_stripe_md *lsm = NULL; // XXX fill in from create
+
+ obd_data2conn(&conn, data);
+ err = obd_close(&conn, &data->ioc_obdo1, lsm);
GOTO(out, err);
}
case OBD_IOC_BRW_WRITE:
rw = OBD_BRW_WRITE;
case OBD_IOC_BRW_READ: {
- struct lov_stripe_md smd;
+ struct lov_stripe_md tmp_lsm; // XXX fill in from create
+ struct lov_stripe_md *lsm = &tmp_lsm; // XXX fill in from create
struct io_cb_data *cbd = ll_init_cb();
obd_count pages = 0;
struct brw_page *pga, *pgp;
__u64 id = data->ioc_obdo1.o_id;
int gfp_mask = (id & 1) ? GFP_HIGHUSER : GFP_KERNEL;
int verify = (id != 0);
- unsigned long off;
+ __u64 off;
int j;
if (!cbd)
obd_data2conn(&conn, data);
pages = data->ioc_count / PAGE_SIZE;
+ off = data->ioc_offset;
- CDEBUG(D_INODE, "BRW %s with %d pages\n",
- rw == OBD_BRW_READ ? "read" : "write", pages);
+ CDEBUG(D_INODE, "BRW %s with %d pages @ "LPX64"\n",
+ rw == OBD_BRW_READ ? "read" : "write", pages, off);
OBD_ALLOC(pga, pages * sizeof(*pga));
if (!pga) {
CERROR("no memory for %d BRW per-page data\n", pages);
GOTO(brw_free, err = -ENOMEM);
}
- memset(&smd, 0, sizeof(smd));
- smd.lmd_object_id = id;
-
- off = data->ioc_offset;
+ memset(lsm, 0, sizeof(*lsm)); // XXX don't do this later
+ lsm->lsm_object_id = id; // ensure id == lsm->lsm_object_id
for (j = 0, pgp = pga; j < pages; j++, off += PAGE_SIZE, pgp++){
pgp->pg = alloc_pages(gfp_mask, 0);
}
}
- err = obd_brw(rw, &conn, &smd, j, pga, ll_sync_io_cb, cbd);
+ err = obd_brw(rw, &conn, lsm, j, pga, ll_sync_io_cb, cbd);
if (err)
CERROR("test_brw: error from obd_brw: err = %d\n", err);
EXIT;
if (err)
GOTO(out, err);
- err = copy_to_user((int *)arg, data, len);
+ err = copy_to_user((void *)arg, data, len);
GOTO(out, err);
}
};
void (*class_signal_connection_failure)(struct ptlrpc_connection *);
-int (*mds_destroy_export)(struct obd_export *exp);
-int (*ldlm_destroy_export)(struct obd_export *exp);
EXPORT_SYMBOL(obd_dev);
EXPORT_SYMBOL(obdo_cachep);
EXPORT_SYMBOL(obd_fail_loc);
EXPORT_SYMBOL(obd_timeout);
EXPORT_SYMBOL(obd_recovery_upcall);
+EXPORT_SYMBOL(ptlrpc_put_connection_superhack);
EXPORT_SYMBOL(class_register_type);
EXPORT_SYMBOL(class_unregister_type);
//EXPORT_SYMBOL(class_multi_cleanup);
EXPORT_SYMBOL(class_signal_connection_failure);
-EXPORT_SYMBOL(mds_destroy_export);
-EXPORT_SYMBOL(ldlm_destroy_export);
EXPORT_SYMBOL(ll_sync_io_cb);
EXPORT_SYMBOL(ll_init_cb);
+EXPORT_SYMBOL(class_nm_to_type);
static int __init init_obdclass(void)
{
obd->obd_minor = i;
err = obd_init_caches();
+
if (err)
return err;
obd_sysctl_init();
+
+ err=lprocfs_reg_main();
+
return 0;
}
static void __exit cleanup_obdclass(void)
{
- int i;
+ int i, err;
ENTRY;
misc_deregister(&obd_psdev);
obd_cleanup_caches();
obd_sysctl_clean();
+
+ err = lprocfs_dereg_main();
+
CERROR("obd memory leaked: %ld bytes\n", obd_memory);
EXIT;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff