#include <linux/obd_support.h>
#include <linux/obd_class.h>
+static int obd_init_magic;
int obd_print_entry = 1;
int obd_debug_level = 4095;
struct obd_device obd_dev[MAX_OBD_DEVICES];
{
struct list_head *tmp;
struct obd_type *type;
+ CDEBUG(D_IOCTL, "SEARCH %s\n", nm);
tmp = &obd_types;
while ( (tmp = tmp->next) != &obd_types ) {
type = list_entry(tmp, struct obd_type, typ_chain);
+ CDEBUG(D_IOCTL, "TYP %s\n", type->typ_name);
if (strlen(type->typ_name) == strlen(nm) &&
strcmp(type->typ_name, nm) == 0 ) {
return type;
return NULL;
}
+
+static int getdata(int len, void **data)
+{
+ void *tmp = NULL;
+
+ if (!len)
+ return 0;
+
+ CDEBUG(D_IOCTL, "getdata: len %d, add %p\n", len, *data);
+
+ OBD_ALLOC(tmp, void *, len);
+ if ( !tmp )
+ return -ENOMEM;
+
+ memset(tmp, 0, len);
+ if ( copy_from_user(tmp, *data, len)) {
+ OBD_FREE(tmp,len);
+ return -EFAULT;
+ }
+ *data = tmp;
+
+ return 0;
+}
+
/* to control /dev/obdNNN */
static int obd_class_ioctl (struct inode * inode, struct file * filp,
unsigned int cmd, unsigned long arg)
{
int err, i_ino, dev;
struct obd_device *obddev;
- struct oic_rw_s rw_s; /* read, write */
+ struct obd_conn conn;
long int cli_id; /* connect, disconnect */
- struct oic_prealloc_s prealloc; /* preallocate */
if (!inode)
return -EINVAL;
+
dev = MINOR(inode->i_rdev);
if (dev > MAX_OBD_DEVICES)
return -ENODEV;
-
obddev = &obd_dev[dev];
-
- /* has this minor been registered? */
- if (cmd != OBD_IOC_SETUP_OBDDEV && !obd_dev[dev].obd_type)
- return -ENODEV;
+ conn.oc_dev = obddev;
switch (cmd) {
- case OBD_IOC_SETUP_OBDDEV: {
+ case TCGETS:
+ return -EINVAL;
+ case OBD_IOC_ATTACH: {
struct obd_type *type;
+ struct oic_generic input;
- struct setup {
- int setup_data;
- char setup_type[24];
- } input;
-
- if ( obddev->obd_type ) {
- CDEBUG(D_IOCTL, "Device %d already setup (type %s)\n",
- dev, obddev->obd_type->typ_name);
- return -1;
+ /* have we attached a type to this device */
+ if ( obddev->obd_type || (obddev->obd_flags & OBD_ATTACHED) ){
+ CDEBUG(D_IOCTL, "OBD Device %d already attached to type %s.\n", dev, obddev->obd_type->typ_name);
+ return -EINVAL;
}
/* get data structures */
- err= copy_from_user(&input, (void *) arg, sizeof(input));
+ err = copy_from_user(&input, (void *) arg, sizeof(input));
if (err)
return err;
- type = obd_nm_to_type(input.setup_type);
+ if ( (err = getdata(input.att_typelen + 1, &input.att_type)) )
+ return err;
+
+ /* find the type */
+ err = -EINVAL;
+ type = obd_nm_to_type(input.att_type);
+ OBD_FREE(input.att_type, input.att_typelen + 1);
if ( !type ) {
- printk("Trying to register non existent type %s\n",
- input.setup_type);
- return -1;
+ printk("Unknown obd type dev %d\n", dev);
+ return err;
}
obddev->obd_type = type;
+
+ /* get the attach data */
+ if ( (err = getdata(input.att_datalen, &input.att_data)) ) {
+ return err;
+ }
+
+ INIT_LIST_HEAD(&obddev->obd_gen_clients);
+ obddev->obd_multi_count = 0;
+
+ CDEBUG(D_IOCTL, "Attach %d, datalen %d, type %s\n",
+ dev, input.att_datalen, obddev->obd_type->typ_name);
+ if (!obddev->obd_type->typ_ops || !OBP(obddev,attach)) {
+ obddev->obd_flags |= OBD_ATTACHED;
+ type->typ_refcnt++;
+ MOD_INC_USE_COUNT;
+ return 0;
+ }
+
+ /* do the attach */
+ err = OBP(obddev,attach)(obddev,
+ input.att_datalen, input.att_data);
+ OBD_FREE(input.att_data, input.att_datalen);
- CDEBUG(D_IOCTL, "Setup %d, type %s\n", dev, input.setup_type);
- if ( obddev->obd_type->typ_ops->o_setup(obddev,
- &input.setup_data)){
+ if ( err ) {
+ obddev->obd_flags &= ~OBD_ATTACHED;
obddev->obd_type = NULL;
- return -1;
} else {
+ obddev->obd_flags |= OBD_ATTACHED;
type->typ_refcnt++;
MOD_INC_USE_COUNT;
+ }
+ return err;
+ }
+
+ case OBD_IOC_DETACH: {
+
+ if (obddev->obd_flags & OBD_SET_UP)
+ return -EINVAL;
+ if (! (obddev->obd_flags & OBD_ATTACHED) )
+ return -EINVAL;
+ if ( !list_empty(&obddev->obd_gen_clients) )
+ return -EINVAL;
+
+ obddev->obd_flags &= ~OBD_ATTACHED;
+ obddev->obd_type->typ_refcnt--;
+ obddev->obd_type = NULL;
+ MOD_DEC_USE_COUNT;
+ return 0;
+ }
+
+
+ case OBD_IOC_FORMAT: {
+ struct ioc_format {
+ int format_datalen;
+ void *format_data;
+ } input;
+
+ /* have we attached a type to this device */
+ if ( !obddev->obd_type ) {
+ CDEBUG(D_IOCTL, "OBD Device %d has no type.\n", dev);
+ return -EINVAL;
+ }
+
+ /* get main structure */
+ err = copy_from_user(&input, (void *) arg, sizeof(input));
+ if (err)
+ return err;
+
+ err = getdata(input.format_datalen, &input.format_data);
+ if (err)
+ return err;
+
+ if (!obddev->obd_type->typ_ops ||
+ !obddev->obd_type->typ_ops->o_format )
+ return -EOPNOTSUPP;
+
+ /* do the format */
+ CDEBUG(D_IOCTL, "Format %d, type %s\n", dev,
+ obddev->obd_type->typ_name);
+ err = obddev->obd_type->typ_ops->o_format
+ (obddev, input.format_datalen, input.format_data);
+
+ OBD_FREE(input.format_data, input.format_datalen);
+ return err;
+ }
+ case OBD_IOC_PARTITION: {
+ struct ioc_part {
+ int part_datalen;
+ void *part_data;
+ } input;
+
+ /* have we attached a type to this device */
+ if ( !obddev->obd_type ) {
+ CDEBUG(D_IOCTL, "OBD Device %d has no type.\n", dev);
+ return -EINVAL;
+ }
+
+ /* get main structure */
+ err = copy_from_user(&input, (void *) arg, sizeof(input));
+ if (err)
+ return err;
+
+ err = getdata(input.part_datalen, &input.part_data);
+ if (err)
+ return err;
+
+ if (!obddev->obd_type->typ_ops ||
+ !obddev->obd_type->typ_ops->o_partition )
+ return -EOPNOTSUPP;
+
+ /* do the partition */
+ CDEBUG(D_IOCTL, "Partition %d, type %s\n", dev,
+ obddev->obd_type->typ_name);
+ err = obddev->obd_type->typ_ops->o_partition
+ (obddev, input.part_datalen, input.part_data);
+
+ OBD_FREE(input.part_data, input.part_datalen);
+ return err;
+ }
+
+ case OBD_IOC_COPY: {
+ struct ioc_mv_s mvdata;
+ struct ioc_part {
+ int part_datalen;
+ void *part_data;
+ } input;
+ obdattr *srcoa, *tgtoa;
+
+ if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
+ (!(obddev->obd_flags & OBD_ATTACHED))) {
+ CDEBUG(D_IOCTL, "Device not attached or set up\n");
+ return -EINVAL;
+ }
+
+ /* get main structure */
+ err = copy_from_user(&input, (void *) arg, sizeof(input));
+ if (err)
+ return err;
+
+
+ err = copy_from_user(&mvdata, input.part_data, sizeof(mvdata));
+ if (err)
+ return err;
+
+ if (!obddev->obd_type->typ_ops ||
+ !obddev->obd_type->typ_ops->o_copy )
+ return -EOPNOTSUPP;
+
+ /* do the partition */
+ CDEBUG(D_IOCTL, "Copy %d, type %s src %ld tgt %ld\n", dev,
+ obddev->obd_type->typ_name, mvdata.src, mvdata.tgt);
+
+ conn.oc_id = mvdata.conn_id;
+ srcoa = obd_oa_fromid(&conn, mvdata.src);
+ if ( !srcoa )
+ return -ENOENT;
+ tgtoa = obd_oa_fromid(&conn, mvdata.tgt);
+ if ( ! tgtoa ) {
+ obd_free_oa(srcoa);
+ return -ENOMEM;
+ }
+
+ err = obddev->obd_type->typ_ops->o_copy(&conn,srcoa, tgtoa);
+
+ obd_free_oa(srcoa);
+ obd_free_oa(tgtoa);
+ return err;
+ }
+ case OBD_IOC_MIGR: {
+ struct ioc_mv_s mvdata;
+ struct ioc_part {
+ int part_datalen;
+ void *part_data;
+ } input;
+ obdattr *srcoa, *tgtoa;
+
+ if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
+ (!(obddev->obd_flags & OBD_ATTACHED))) {
+ CDEBUG(D_IOCTL, "Device not attached or set up\n");
+ return -EINVAL;
+ }
+
+ /* get main structure */
+ err = copy_from_user(&input, (void *) arg, sizeof(input));
+ if (err)
+ return err;
+
+
+ CDEBUG(D_IOCTL, "Migrate copying %d\n", sizeof(mvdata));
+ err = copy_from_user(&mvdata, input.part_data, sizeof(mvdata));
+ if (err)
+ return err;
+
+ if (!obddev->obd_type->typ_ops ||
+ !obddev->obd_type->typ_ops->o_copy )
+ return -EOPNOTSUPP;
+
+ /* do the partition */
+ CDEBUG(D_IOCTL, "Migrate %d, type %s conn %d src %ld tgt %ld\n", dev,
+ obddev->obd_type->typ_name, mvdata.conn_id, mvdata.src, mvdata.tgt);
+
+
+ if ( ! (srcoa = obd_empty_oa()) )
+ return -ENOMEM;
+ if ( ! (tgtoa = obd_empty_oa()) ) {
+ obd_free_oa(srcoa);
+ return -ENOMEM;
+ }
+
+ srcoa->i_ino = mvdata.src;
+ tgtoa->i_ino = mvdata.tgt;
+
+ conn.oc_id = mvdata.conn_id;
+
+ err = obddev->obd_type->typ_ops->o_migrate(&conn, tgtoa, srcoa);
+
+ obd_free_oa(srcoa);
+ obd_free_oa(tgtoa);
+ return err;
+ }
+
+ case OBD_IOC_SETUP: {
+ struct ioc_setup {
+ int setup_datalen;
+ void *setup_data;
+ } input;
+
+ /* have we attached a type to this device */
+ if (!(obddev->obd_flags & OBD_ATTACHED)) {
+ CDEBUG(D_IOCTL, "OBD Device %d has no type.\n", dev);
+ return -EINVAL;
+ }
+
+ /* has this been done already? */
+ if ( obddev->obd_flags & OBD_SET_UP ) {
+ CDEBUG(D_IOCTL, "Device %d already setup (type %s)\n",
+ dev, obddev->obd_type->typ_name);
+ return -EINVAL;
+ }
+
+ /* get main structure */
+ err = copy_from_user(&input, (void *) arg, sizeof(input));
+ if (err)
+ return err;
+
+ err = getdata(input.setup_datalen, &input.setup_data);
+ if (err)
+ return err;
+
+
+ /* do the setup */
+ CDEBUG(D_IOCTL, "Setup %d, type %s\n", dev,
+ obddev->obd_type->typ_name);
+ if ( !obddev->obd_type->typ_ops ||
+ !obddev->obd_type->typ_ops->o_setup ) {
+ obddev->obd_flags |= OBD_SET_UP;
return 0;
}
+
+ err = obddev->obd_type->typ_ops->o_setup
+ (obddev, input.setup_datalen, input.setup_data);
+
+ if ( err )
+ obddev->obd_flags &= ~OBD_SET_UP;
+ else {
+ obddev->obd_type->typ_refcnt++;
+ obddev->obd_flags |= OBD_SET_UP;
+ }
+ return err;
}
- case OBD_IOC_CLEANUP_OBDDEV: {
+ case OBD_IOC_CLEANUP: {
int rc;
+ /* has this minor been registered? */
+ if (!obddev->obd_type)
+ return -ENODEV;
+
if ( !obddev->obd_type->typ_refcnt )
printk("OBD_CLEANUP: refcount wrap!\n");
+ if ( !obddev->obd_flags & OBD_SET_UP )
+ return -EINVAL;
+
if ( !obddev->obd_type->typ_ops->o_cleanup )
- goto out;
+ goto cleanup_out;
/* cleanup has no argument */
- rc = obddev->obd_type->typ_ops->o_cleanup(obddev);
+ rc = OBP(obddev, cleanup)(obddev);
if ( rc )
return rc;
- out:
+ cleanup_out:
+ obddev->obd_flags &= ~OBD_SET_UP;
obddev->obd_type->typ_refcnt--;
- obddev->obd_type = NULL;
- MOD_DEC_USE_COUNT;
return 0;
}
case OBD_IOC_CONNECT:
{
- struct obd_conn_info conninfo;
- if (obddev->obd_type->typ_ops->o_connect(dev, &conninfo))
+ if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
+ (!(obddev->obd_flags & OBD_ATTACHED))) {
+ CDEBUG(D_IOCTL, "Device not attached or set up\n");
return -EINVAL;
+ }
- return copy_to_user((int *)arg, &conninfo,
- sizeof(struct obd_conn_info));
+
+ if (obddev->obd_type->typ_ops->o_connect(&conn))
+ return -EINVAL;
+
+ return copy_to_user((int *)arg, &conn.oc_id,
+ sizeof(int));
}
case OBD_IOC_DISCONNECT:
/* frees data structures */
+ /* has this minor been registered? */
+ if (!obddev->obd_type)
+ return -ENODEV;
+
get_user(cli_id, (int *) arg);
+ conn.oc_id = cli_id;
- obddev->obd_type->typ_ops->o_disconnect(cli_id);
+ OBP(obddev, disconnect)(&conn);
return 0;
- case OBD_IOC_SYNC:
+ case OBD_IOC_SYNC: {
/* sync doesn't need a connection ID, because it knows
* what device it was called on, and can thus get the
* superblock that it needs. */
- if (!obddev->u.sim.sim_sb || !obddev->u.sim.sim_sb->s_dev) {
+ /* has this minor been registered? */
+ if (!obddev->obd_type)
+ return -ENODEV;
+
+ if (!obddev->u.ext2.ext2_sb || !obddev->u.ext2.ext2_sb->s_dev) {
CDEBUG(D_IOCTL, "fatal: device not initialized.\n");
err = -EINVAL;
} else {
- if ((err = fsync_dev(obddev->u.sim.sim_sb->s_dev)))
+ if ((err = fsync_dev(obddev->u.ext2.ext2_sb->s_dev)))
CDEBUG(D_IOCTL, "sync: fsync_dev failure\n");
else
CDEBUG(D_IOCTL, "sync: success\n");
}
return put_user(err, (int *) arg);
- case OBD_IOC_CREATE:
- /* similarly, create doesn't need a connection ID for
- * the same reasons. */
- if (!obddev->u.sim.sim_sb) {
- CDEBUG(D_IOCTL, "fatal: device not initialized.\n");
- return put_user(-EINVAL, (int *) arg);
- }
+ }
+ case OBD_IOC_CREATE: {
+ int err;
+ struct oic_create_s foo;
+
+ if ( copy_from_user(&foo, (const void *)arg, sizeof(foo)) )
+ return -EFAULT;
- i_ino = obddev->obd_type->typ_ops->o_create(obddev, 0, &err);
+ /* has this minor been registered? */
+ if ( !(obddev->obd_flags & OBD_ATTACHED) ||
+ !(obddev->obd_flags & OBD_SET_UP))
+ return -ENODEV;
+ conn.oc_id = foo.conn_id;
+
+ i_ino = OBP(obddev, create)(&conn, foo.prealloc, &err);
if (err) {
CDEBUG(D_IOCTL, "create: obd_inode_new failure\n");
/* 0 is the only error value */
}
return put_user(i_ino, (int *) arg);
+ }
case OBD_IOC_DESTROY:
{
struct destroy_s {
unsigned int conn_id;
unsigned int ino;
} destroy;
+ obdattr *oa;
+ int rc;
+
+ if ( ! (oa = obd_empty_oa()) )
+ return -ENOMEM;
+
+ /* has this minor been registered? */
+ if (!obddev->obd_type)
+ return -ENODEV;
+
+
copy_from_user(&destroy, (int *)arg, sizeof(struct destroy_s));
if ( !obddev->obd_type ||
!obddev->obd_type->typ_ops->o_destroy)
return -EINVAL;
- return obddev->obd_type->typ_ops->o_destroy(destroy.conn_id, destroy.ino);
+ oa->i_ino = destroy.ino;
+ conn.oc_id = destroy.conn_id;
+ rc = obddev->obd_type->typ_ops->o_destroy(&conn, oa);
+ OBD_FREE(oa, sizeof(*oa));
+ return rc;
}
case OBD_IOC_SETATTR:
{
- int err;
- struct tmp {
- unsigned int conn_id;
- unsigned long ino;
- struct iattr iattr;
- } foo;
+ struct oic_attr_s foo;
+ obdattr *oa;
+ int rc;
- err= copy_from_user(&foo, (int *)arg, sizeof(struct tmp));
- if (err)
- return err;
+ if ( ! (oa = obd_empty_oa()) )
+ return -ENOMEM;
+
+ /* has this minor been registered? */
+ if (!obddev->obd_type)
+ return -ENODEV;
+
+ rc = copy_from_user(&foo, (int *)arg, sizeof(foo));
+ if (rc)
+ return rc;
if ( !obddev->obd_type ||
!obddev->obd_type->typ_ops->o_setattr)
return -EINVAL;
-
- return obddev->obd_type->typ_ops->o_setattr(foo.conn_id, foo.ino, &foo.iattr);
+
+ oa->i_ino = foo.ino;
+ inode_setattr(oa, &foo.iattr);
+ conn.oc_id = foo.conn_id;
+ rc = obddev->obd_type->typ_ops->o_setattr(&conn, oa);
+ OBD_FREE(oa, sizeof(*oa));
+ return rc;
}
case OBD_IOC_GETATTR:
{
- int err;
- struct tmp {
+ int rc;
+ struct oic_getattr {
unsigned int conn_id;
unsigned long ino;
} foo;
struct iattr iattr;
- copy_from_user(&foo, (int *)arg, sizeof(struct tmp));
+ obdattr *oa;
- if ( !obddev->obd_type ||
- !obddev->obd_type->typ_ops->o_getattr)
- return -EINVAL;
+ rc = copy_from_user(&foo, (int *)arg, sizeof(foo));
+ if (rc)
+ return rc;
- if (obddev->obd_type->typ_ops->o_getattr(foo.conn_id,
- foo.ino, &iattr))
- return -EINVAL;
+ conn.oc_id = foo.conn_id;
+ oa = obd_oa_fromid(&conn, foo.ino);
+ if ( !oa )
+ return -ENOENT;
- err = copy_to_user((int *)arg, &iattr, sizeof(iattr));
- return err;
+ inode_to_iattr(oa, &iattr);
+ rc = copy_to_user((int *)arg, &iattr, sizeof(iattr));
+ return rc;
}
- case OBD_IOC_READ2:
+ case OBD_IOC_READ:
{
- int err;
+ obdattr *oa = NULL;
+ int rc;
+ struct oic_rw_s rw_s; /* read, write ioctl str */
- err = copy_from_user(&rw_s, (int *)arg, sizeof(struct oic_rw_s));
- if ( err )
- return err;
+ rc = copy_from_user(&rw_s, (int *)arg, sizeof(rw_s));
+ if ( rc )
+ goto READ_OUT;
+
+
+ conn.oc_id = rw_s.conn_id;
+ if ( ! (oa = obd_oa_fromid(&conn, rw_s.id)) )
+ return -ENOENT;
+ rc = -EINVAL;
if ( !obddev->obd_type->typ_ops ||
!obddev->obd_type->typ_ops->o_read )
- return -EINVAL;
+ goto READ_OUT;
- rw_s.count = obddev->obd_type->typ_ops->o_read2(rw_s.conn_id,
- rw_s.inode,
- rw_s.buf,
- rw_s.count,
- rw_s.offset,
- &err);
- if ( err )
- return err;
+ rc = obddev->obd_type->typ_ops->o_read
+ (&conn, oa, rw_s.buf, &rw_s.count, rw_s.offset);
+ if ( rc )
+ goto READ_OUT;
- err = copy_to_user((int*)arg, &rw_s.count,
- sizeof(unsigned long));
- return err;
+ rc = copy_to_user((int*)arg, &rw_s.count, sizeof(rw_s.count));
+
+ READ_OUT:
+ if ( oa )
+ OBD_FREE(oa, sizeof(*oa));
+ return rc;
}
+ case OBD_IOC_WRITE: {
+ obdattr *oa = NULL;
+ int rc;
+ struct oic_rw_s rw_s; /* read, write ioctl str */
- case OBD_IOC_READ:
- {
- int err;
+ rc = copy_from_user(&rw_s, (int *)arg, sizeof(rw_s));
+ if ( rc )
+ goto WRITE_OUT;
- err = copy_from_user(&rw_s, (int *)arg, sizeof(struct oic_rw_s));
- if ( err )
- return err;
+ conn.oc_id = rw_s.conn_id;
+ oa = obd_oa_fromid(&conn, rw_s.id);
+ if ( !oa )
+ return -ENOENT;
+ rc = -EINVAL;
if ( !obddev->obd_type->typ_ops ||
- !obddev->obd_type->typ_ops->o_read )
- return -EINVAL;
+ !obddev->obd_type->typ_ops->o_write )
+ goto WRITE_OUT;
- rw_s.count = obddev->obd_type->typ_ops->o_read(rw_s.conn_id,
- rw_s.inode,
- rw_s.buf,
- rw_s.count,
- rw_s.offset,
- &err);
- if ( err )
- return err;
+ rc = obddev->obd_type->typ_ops->o_write
+ (&conn, oa, rw_s.buf, &rw_s.count, rw_s.offset);
+ if ( rc )
+ goto WRITE_OUT;
- err = copy_to_user((int*)arg, &rw_s.count,
- sizeof(unsigned long));
- return err;
+ rc = copy_to_user((int*)arg, &rw_s.count, sizeof(rw_s.count));
+
+ WRITE_OUT:
+ OBD_FREE(oa, sizeof(*oa));
+ return rc;
}
+ case OBD_IOC_PREALLOCATE: {
+ struct oic_prealloc_s prealloc;
+ int rc;
- case OBD_IOC_WRITE:
- {
- int err;
+ /* has this minor been registered? */
+ if (!obddev->obd_type)
+ return -ENODEV;
- copy_from_user(&rw_s, (int *)arg, sizeof(struct oic_rw_s));
- CDEBUG(D_IOCTL, "\n");
- if ( !obddev->obd_type->typ_ops->o_write )
- return -EINVAL;
- rw_s.count =
- obddev->obd_type->typ_ops->o_write(rw_s.conn_id,
- rw_s.inode,
- rw_s.buf,
- rw_s.count,
- rw_s.offset,
- &err);
-
- printk("Result rw_s.count %ld\n", rw_s.count);
- return (int)rw_s.count;
- copy_to_user((int *)arg, &rw_s.count,
- sizeof(unsigned long));
- return err;
- }
- case OBD_IOC_PREALLOCATE:
- copy_from_user(&prealloc, (int *)arg,
- sizeof(struct oic_prealloc_s));
- if (!obddev->u.sim.sim_sb || !obddev->u.sim.sim_sb->s_dev) {
+ rc = copy_from_user(&prealloc, (int *)arg, sizeof(prealloc));
+ if (rc)
+ return -ENOMEM;
+
+ if ( !(obddev->obd_flags & OBD_ATTACHED) ||
+ !(obddev->obd_flags & OBD_SET_UP)) {
CDEBUG(D_IOCTL, "fatal: device not initialized.\n");
return -EINVAL;
}
if (!obddev->obd_type ||
!obddev->obd_type->typ_ops->o_preallocate)
- return -EINVAL;
+ return -EOPNOTSUPP;
+ conn.oc_id = prealloc.cli_id;
+ rc = obddev->obd_type->typ_ops->o_preallocate
+ (&conn, &prealloc.alloc, prealloc.inodes);
+ if ( rc )
+ return rc;
- prealloc.alloc =
- obddev->obd_type->typ_ops->o_preallocate(prealloc.cli_id, prealloc.alloc,
- prealloc.inodes, &err);
- if ( err )
- return err;
- return copy_to_user((int *)arg, &prealloc,
- sizeof(struct oic_prealloc_s));
+ return copy_to_user((int *)arg, &prealloc, sizeof(prealloc));
+ }
case OBD_IOC_STATFS:
{
struct statfs *tmp;
struct statfs buf;
int rc;
+ /* has this minor been registered? */
+ if (!obddev->obd_type)
+ return -ENODEV;
+
tmp = (void *)arg + sizeof(unsigned int);
get_user(conn_id, (int *) arg);
if ( !obddev->obd_type ||
!obddev->obd_type->typ_ops->o_statfs)
return -EINVAL;
- rc = obddev->obd_type->typ_ops->o_statfs(conn_id, &buf);
+ conn.oc_id = conn_id;
+ rc = obddev->obd_type->typ_ops->o_statfs(&conn, &buf);
if ( rc )
return rc;
rc = copy_to_user(tmp, &buf, sizeof(buf));
return rc;
}
- default:
- printk("invalid ioctl: cmd = %u, arg = %lu\n", cmd, arg);
- return -ENOTTY;
+ default: {
+ struct obd_type *type;
+ struct oic_generic input;
+ void *karg;
+
+ /* get data structures */
+ err = copy_from_user(&input, (void *) arg, sizeof(input));
+ if (err) {
+ EXIT;
+ return err;
+ }
+
+ if ( (err = getdata(input.att_typelen + 1, &input.att_type))){
+ EXIT;
+ return err;
+ }
+
+ /* find the type */
+ err = -EINVAL;
+ type = obd_nm_to_type(input.att_type);
+ OBD_FREE(input.att_type, input.att_typelen + 1);
+ if ( !type ) {
+ printk("Unknown obd type dev %d\n", dev);
+ EXIT;
+ return err;
+ }
+
+ if ( !type->typ_ops->o_iocontrol ) {
+ EXIT;
+ return -EINVAL;
+ }
+ conn.oc_id = input.att_connid;
+
+ CDEBUG(D_IOCTL, "Calling ioctl %x for type %s, len %d\n",
+ cmd, type->typ_name, input.att_datalen);
+
+ /* get the generic data */
+ karg = input.att_data;
+ if ( (err = getdata(input.att_datalen, &karg)) ) {
+ EXIT;
+ return err;
+ }
+
+ err = type->typ_ops->o_iocontrol
+ (cmd, &conn, input.att_datalen,
+ karg, input.att_data);
+ OBD_FREE(karg, input.att_datalen);
+
+ EXIT;
+ return err;
+ }
}
}
{
struct obd_type *type;
+
+ if (obd_init_magic != 0x11223344) {
+ EXIT;
+ return -EINVAL;
+ }
+
if ( obd_nm_to_type(nm) ) {
CDEBUG(D_IOCTL, "Type %s already registered\n", nm);
+ EXIT;
return -1;
}
-
+
OBD_ALLOC(type, struct obd_type * , sizeof(*type));
- if ( !type )
+ if ( !type ) {
+ EXIT;
return -ENOMEM;
+ }
memset(type, 0, sizeof(*type));
INIT_LIST_HEAD(&type->typ_chain);
-
+ MOD_INC_USE_COUNT;
list_add(&type->typ_chain, obd_types.next);
type->typ_ops = ops;
type->typ_name = nm;
+ EXIT;
return 0;
}
{
struct obd_type *type = obd_nm_to_type(nm);
- if ( !type )
+ if ( !type ) {
+ MOD_DEC_USE_COUNT;
+ printk("OBD: NO TYPE\n");
+ EXIT;
return -1;
+ }
- if ( type->typ_refcnt )
+ if ( type->typ_refcnt ) {
+ MOD_DEC_USE_COUNT;
+ printk("OBD: refcount wrap\n");
+ EXIT;
return -1;
+ }
list_del(&type->typ_chain);
OBD_FREE(type, sizeof(*type));
+ MOD_DEC_USE_COUNT;
return 0;
}
int i;
printk(KERN_INFO "OBD class driver v0.002, braam@stelias.com\n");
-
+
INIT_LIST_HEAD(&obd_types);
-
+
if (register_chrdev(OBD_PSDEV_MAJOR,"obd_psdev",
&obd_psdev_fops)) {
printk(KERN_ERR "obd_psdev: unable to get major %d\n",
for (i = 0; i < MAX_OBD_DEVICES; i++) {
memset(&(obd_dev[i]), 0, sizeof(obd_dev[i]));
- INIT_LIST_HEAD(&obd_dev[i].u.sim.sim_clients);
+ obd_dev[i].obd_minor = i;
+ INIT_LIST_HEAD(&obd_dev[i].obd_gen_clients);
}
obd_sysctl_init();
-
+ obd_init_magic = 0x11223344;
return 0;
}
EXPORT_SYMBOL(obd_debug_level);
EXPORT_SYMBOL(obd_dev);
+EXPORT_SYMBOL(gen_connect);
+EXPORT_SYMBOL(gen_client);
+EXPORT_SYMBOL(gen_cleanup);
+EXPORT_SYMBOL(gen_disconnect);
+EXPORT_SYMBOL(gen_copy_data);
+
+/* EXPORT_SYMBOL(gen_multi_attach); */
+EXPORT_SYMBOL(gen_multi_setup);
+EXPORT_SYMBOL(gen_multi_cleanup);
+
+
#ifdef MODULE
int init_module(void)
{
for (i = 0; i < MAX_OBD_DEVICES; i++) {
struct obd_device *obddev = &obd_dev[i];
if ( obddev->obd_type &&
- obddev->obd_type->typ_ops->o_cleanup_device )
- return obddev->obd_type->typ_ops->o_cleanup_device(i);
+ (obddev->obd_flags & OBD_SET_UP) &&
+ obddev->obd_type->typ_ops->o_detach ) {
+ OBP(obddev, detach)(obddev);
+ }
}
+
obd_sysctl_clean();
+ obd_init_magic = 0;
}
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff