#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/major.h>
+#include <linux/kmod.h> /* for request_module() */
#include <linux/sched.h>
#include <linux/lp.h>
#include <linux/malloc.h>
#include <linux/obd_class.h>
static int obd_init_magic;
-int obd_print_entry = 1;
-int obd_debug_level = 4095;
+int obd_print_entry = 0;
+int obd_debug_level = D_IOCTL|D_INODE|D_SUPER|D_WARNING|D_MALLOC|D_CACHE;
+long obd_memory = 0;
struct obd_device obd_dev[MAX_OBD_DEVICES];
struct list_head obd_types;
return -ENODEV;
fsync_dev(inode->i_rdev);
if (obd_dev[dev].obd_refcnt <= 0)
- printk(KERN_ALERT "obd_class_release: refcount(%d) <= 0\n",
+ printk(KERN_ALERT __FUNCTION__ ": refcount(%d) <= 0\n",
obd_dev[dev].obd_refcnt);
obd_dev[dev].obd_refcnt--;
{
struct list_head *tmp;
struct obd_type *type;
- CDEBUG(D_IOCTL, "SEARCH %s\n", nm);
+ CDEBUG(D_INFO, "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);
+ CDEBUG(D_INFO, "TYP %s\n", type->typ_name);
if (strlen(type->typ_name) == strlen(nm) &&
strcmp(type->typ_name, nm) == 0 ) {
return type;
{
void *tmp = NULL;
- if (!len)
+ if (!len) {
+ *data = NULL;
return 0;
+ }
- CDEBUG(D_IOCTL, "getdata: len %d, add %p\n", len, *data);
+ CDEBUG(D_MALLOC, "len %d, add %p\n", len, *data);
OBD_ALLOC(tmp, void *, len);
if ( !tmp )
memset(tmp, 0, len);
if ( copy_from_user(tmp, *data, len)) {
- OBD_FREE(tmp,len);
+ OBD_FREE(tmp, len);
return -EFAULT;
}
*data = tmp;
unsigned int cmd, unsigned long arg)
{
struct obd_device *obddev;
+ /* NOTE this must be larger than any of the ioctl data structs */
+ char buf[1024];
+ void *tmp_buf = buf;
struct obd_conn conn;
int err, dev;
long int cli_id; /* connect, disconnect */
- if (!inode)
+ if (!inode) {
+ CDEBUG(D_IOCTL, "invalid inode\n");
return -EINVAL;
+ }
dev = MINOR(inode->i_rdev);
if (dev > MAX_OBD_DEVICES)
return -EINVAL;
case OBD_IOC_ATTACH: {
struct obd_type *type;
- struct oic_generic input;
+ struct oic_generic *input = tmp_buf;
+ char *nm;
ENTRY;
/* have we attached a type to this device */
- if ( obddev->obd_type || (obddev->obd_flags & OBD_ATTACHED) ){
+ 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);
}
/* get data structures */
- err = copy_from_user(&input, (void *)arg, sizeof(input));
+ err = copy_from_user(input, (void *)arg, sizeof(*input));
if ( err ) {
EXIT;
return err;
}
- err = getdata(input.att_typelen + 1, &input.att_type);
+ err = getdata(input->att_typelen + 1, &input->att_type);
if ( err ) {
EXIT;
return err;
}
/* find the type */
- type = obd_nm_to_type(input.att_type);
- OBD_FREE(input.att_type, input.att_typelen + 1);
+ nm = input->att_type;
+ type = obd_nm_to_type(nm);
+#ifdef CONFIG_KMOD
if ( !type ) {
- printk("Unknown obd type dev %d\n", dev);
+ if ( !request_module(nm) ) {
+ CDEBUG(D_PSDEV, "Loaded module '%s'\n", nm);
+ type = obd_nm_to_type(nm);
+ } else {
+ CDEBUG(D_PSDEV, "Can't load module '%s'\n", nm);
+ }
+ }
+#endif
+
+ OBD_FREE(input->att_type, input->att_typelen + 1);
+ if ( !type ) {
+ printk(__FUNCTION__ ": unknown obd type dev %d\n",
+ dev);
EXIT;
return -EINVAL;
}
obddev->obd_type = type;
/* get the attach data */
- err = getdata(input.att_datalen, &input.att_data);
+ err = getdata(input->att_datalen, &input->att_data);
if ( err ) {
EXIT;
return err;
obddev->obd_multi_count = 0;
CDEBUG(D_IOCTL, "Attach %d, datalen %d, type %s\n",
- dev, input.att_datalen, obddev->obd_type->typ_name);
+ dev, input->att_datalen, obddev->obd_type->typ_name);
+ /* maybe we are done */
if ( !OBT(obddev) || !OBP(obddev, attach) ) {
- obddev->obd_flags |= OBD_ATTACHED;
+ obddev->obd_flags |= OBD_ATTACHED;
type->typ_refcnt++;
- CDEBUG(D_IOCTL, "Dev %d refcount now %d\n", dev,
+ CDEBUG(D_PSDEV, "Dev %d refcount now %d\n", dev,
type->typ_refcnt);
+ if (input->att_data)
+ OBD_FREE(input->att_data, input->att_datalen);
MOD_INC_USE_COUNT;
EXIT;
return 0;
}
/* do the attach */
- err = OBP(obddev, attach)(obddev, input.att_datalen,
- input.att_data);
- OBD_FREE(input.att_data, input.att_datalen);
+ err = OBP(obddev, attach)(obddev, input->att_datalen,
+ input->att_data);
+ if (input->att_data)
+ OBD_FREE(input->att_data, input->att_datalen);
if ( err ) {
obddev->obd_flags &= ~OBD_ATTACHED;
} else {
obddev->obd_flags |= OBD_ATTACHED;
type->typ_refcnt++;
- CDEBUG(D_IOCTL, "Dev %d refcount now %d\n", dev,
+ CDEBUG(D_PSDEV, "Dev %d refcount now %d\n", dev,
type->typ_refcnt);
MOD_INC_USE_COUNT;
EXIT;
return -EBUSY;
}
- CDEBUG(D_IOCTL, "Detach %d, type %s\n", dev,
+ CDEBUG(D_PSDEV, "Detach %d, type %s\n", dev,
obddev->obd_type->typ_name);
obddev->obd_flags &= ~OBD_ATTACHED;
obddev->obd_type->typ_refcnt--;
- CDEBUG(D_IOCTL, "Dev %d refcount now %d\n", dev,
+ CDEBUG(D_PSDEV, "Dev %d refcount now %d\n", dev,
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 -ENODEV;
- }
-
- /* 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 ( !OBT(obddev) || !OBP(obddev, format) )
- return -EOPNOTSUPP;
-
- /* do the format */
- CDEBUG(D_IOCTL, "Format %d, type %s\n", dev,
- obddev->obd_type->typ_name);
- err = OBP(obddev, 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 -ENODEV;
- }
-
- /* 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 ( !OBT(obddev) || !OBP(obddev, partition) )
- return -EOPNOTSUPP;
-
- /* do the partition */
- CDEBUG(D_IOCTL, "Partition %d, type %s\n", dev,
- obddev->obd_type->typ_name);
- err = OBP(obddev, 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 *src, *dst;
-
- if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
- (!(obddev->obd_flags & OBD_ATTACHED))) {
- CDEBUG(D_IOCTL, "Device not attached or set up\n");
- return -ENODEV;
- }
-
- /* 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 ( !OBT(obddev) || !OBP(obddev, copy) )
- return -EOPNOTSUPP;
-
- /* do the partition */
- CDEBUG(D_IOCTL, "Copy %d, type %s dst %ld src %ld\n", dev,
- obddev->obd_type->typ_name, mvdata.dst, mvdata.src);
-
- conn.oc_id = mvdata.conn_id;
- src = obd_oa_fromid(&conn, mvdata.src);
- if ( !src )
- return -ENOENT;
- dst = obd_oa_fromid(&conn, mvdata.dst);
- if ( ! dst ) {
- obd_free_oa(src);
- return -ENOENT;
- }
-
- err = OBP(obddev, copy)(&conn, dst, src);
-
- obd_free_oa(src);
- obd_free_oa(dst);
- return err;
- }
- case OBD_IOC_MIGR: {
- struct ioc_mv_s mvdata;
- struct ioc_part {
- int part_datalen;
- void *part_data;
- } input;
- obdattr *src, *dst;
-
- if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
- (!(obddev->obd_flags & OBD_ATTACHED))) {
- CDEBUG(D_IOCTL, "Device not attached or set up\n");
- return -ENODEV;
- }
-
- /* 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 ( !OBT(obddev) || !OBP(obddev, migrate) )
- return -EOPNOTSUPP;
-
- /* do the partition */
- CDEBUG(D_IOCTL, "Migrate %d, type %s conn %d src %ld dst %ld\n",
- dev, obddev->obd_type->typ_name, mvdata.conn_id,
- mvdata.src, mvdata.dst);
-
-
- if ( ! (src = obd_empty_oa()) )
- return -ENOMEM;
- if ( ! (dst = obd_empty_oa()) ) {
- obd_free_oa(src);
- return -ENOMEM;
- }
-
- src->i_ino = mvdata.src;
- dst->i_ino = mvdata.dst;
-
- conn.oc_id = mvdata.conn_id;
-
- err = OBP(obddev, migrate)(&conn, dst, src);
-
- obd_free_oa(src);
- obd_free_oa(dst);
- return err;
- }
-
case OBD_IOC_SETUP: {
struct ioc_setup {
int setup_datalen;
void *setup_data;
- } input;
+ } *setup;
+ setup = tmp_buf;
ENTRY;
/* have we attached a type to this device */
}
/* get main structure */
- err = copy_from_user(&input, (void *) arg, sizeof(input));
+ err = copy_from_user(setup, (void *) arg, sizeof(*setup));
if (err) {
EXIT;
return err;
}
- err = getdata(input.setup_datalen, &input.setup_data);
+ err = getdata(setup->setup_datalen, &setup->setup_data);
if (err) {
EXIT;
return err;
}
/* do the setup */
- CDEBUG(D_IOCTL, "Setup %d, type %s\n", dev,
+ CDEBUG(D_PSDEV, "Setup %d, type %s\n", dev,
obddev->obd_type->typ_name);
if ( !OBT(obddev) || !OBP(obddev, setup) ) {
obddev->obd_type->typ_refcnt++;
- CDEBUG(D_IOCTL, "Dev %d refcount now %d\n",
+ CDEBUG(D_PSDEV, "Dev %d refcount now %d\n",
dev, obddev->obd_type->typ_refcnt);
+ if (setup->setup_data)
+ OBD_FREE(setup->setup_data,
+ setup->setup_datalen);
obddev->obd_flags |= OBD_SET_UP;
EXIT;
return 0;
}
- err = OBP(obddev, setup)(obddev, input.setup_datalen,
- input.setup_data);
+ err = OBP(obddev, setup)(obddev, setup->setup_datalen,
+ setup->setup_data);
if ( err ) {
obddev->obd_flags &= ~OBD_SET_UP;
EXIT;
} else {
obddev->obd_type->typ_refcnt++;
- CDEBUG(D_IOCTL, "Dev %d refcount now %d\n",
+ CDEBUG(D_PSDEV, "Dev %d refcount now %d\n",
dev, obddev->obd_type->typ_refcnt);
obddev->obd_flags |= OBD_SET_UP;
EXIT;
}
+ if (setup->setup_data)
+ OBD_FREE(setup->setup_data, setup->setup_datalen);
return err;
}
case OBD_IOC_CLEANUP: {
}
if ( !obddev->obd_type->typ_refcnt ) {
- printk("OBD_CLEANUP: Dev %d has refcount (%d)!\n",
+ CDEBUG(D_IOCTL, "dev %d has refcount (%d)!\n",
dev, obddev->obd_type->typ_refcnt);
EXIT;
return -EBUSY;
if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
(!(obddev->obd_flags & OBD_ATTACHED))) {
- CDEBUG(D_IOCTL, "Device not attached or set up\n");
+ CDEBUG(D_IOCTL, "device not attached or set up\n");
EXIT;
return -ENODEV;
}
cleanup_out:
obddev->obd_flags &= ~OBD_SET_UP;
obddev->obd_type->typ_refcnt--;
- CDEBUG(D_IOCTL, "Dev %d refcount now %d\n", dev,
+ CDEBUG(D_PSDEV, "Dev %d refcount now %d\n", dev,
obddev->obd_type->typ_refcnt);
EXIT;
return 0;
return err;
return copy_to_user((int *)arg, &conn.oc_id,
- sizeof(int));
+ sizeof(uint32_t));
}
case OBD_IOC_DISCONNECT:
/* frees data structures */
return 0;
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. */
- /* has this minor been registered? */
+ struct oic_range_s *range = tmp_buf;
+
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 = -ENODEV;
- } else {
- err = fsync_dev(obddev->u.ext2.ext2_sb->s_dev);
- if ( err )
- CDEBUG(D_IOCTL, "sync: fsync_dev failure\n");
- else
- CDEBUG(D_IOCTL, "sync: success\n");
+ err = copy_from_user(range, (const void *)arg, sizeof(*range));
+
+ if ( err ) {
+ EXIT;
+ return err;
+ }
+
+ if ( !OBT(obddev) || !OBP(obddev, sync) ) {
+ err = -EOPNOTSUPP;
+ EXIT;
+ return err;
}
+ /* XXX sync needs to be tested/verified */
+ err = OBP(obddev, sync)(&conn, &range->obdo, range->count,
+ range->offset);
+
+ if ( err ) {
+ EXIT;
+ return err;
+ }
+
return put_user(err, (int *) arg);
}
case OBD_IOC_CREATE: {
- struct oic_create_s foo;
- objid id;
+ struct oic_attr_s *attr = tmp_buf;
- if ( copy_from_user(&foo, (const void *)arg, sizeof(foo)) )
- return -EFAULT;
+ err = copy_from_user(attr, (const void *)arg, sizeof(*attr));
+ if (err) {
+ EXIT;
+ return err;
+ }
/* has this minor been registered? */
if ( !(obddev->obd_flags & OBD_ATTACHED) ||
CDEBUG(D_IOCTL, "Device not attached or set up\n");
return -ENODEV;
}
- conn.oc_id = foo.conn_id;
+ conn.oc_id = attr->conn_id;
if ( !OBT(obddev) || !OBP(obddev, create) )
return -EOPNOTSUPP;
- err = OBP(obddev, create)(&conn, foo.prealloc, &id);
+ err = OBP(obddev, create)(&conn, &attr->obdo);
if (err) {
- CDEBUG(D_IOCTL, "create: obd_inode_new failure\n");
- /* 0 is the only error value */
- put_user(0, (int *) arg);
+ EXIT;
return err;
}
- return put_user(id, (int *) arg);
+ err = copy_to_user((int *)arg, attr, sizeof(*attr));
+ EXIT;
+ return err;
}
+
case OBD_IOC_DESTROY: {
- struct destroy_s {
- unsigned int conn_id;
- unsigned int ino;
- } destroy;
- obdattr *oa;
+ struct oic_attr_s *attr = tmp_buf;
- 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));
+ err = copy_from_user(attr, (int *)arg, sizeof(*attr));
+ if ( err ) {
+ EXIT;
+ return err;
+ }
+
if ( !OBT(obddev) || !OBP(obddev, destroy) )
return -EOPNOTSUPP;
- oa->i_ino = destroy.ino;
- conn.oc_id = destroy.conn_id;
- err = OBP(obddev, destroy)(&conn, oa);
- OBD_FREE(oa, sizeof(*oa));
+ conn.oc_id = attr->conn_id;
+ err = OBP(obddev, destroy)(&conn, &attr->obdo);
+ EXIT;
return err;
}
- case OBD_IOC_SETATTR: {
- struct oic_attr_s foo;
- obdattr *oa;
- if ( ! (oa = obd_empty_oa()) )
- return -ENOMEM;
+ case OBD_IOC_SETATTR: {
+ struct oic_attr_s *attr = tmp_buf;
/* has this minor been registered? */
if (!obddev->obd_type)
return -ENODEV;
- err = copy_from_user(&foo, (int *)arg, sizeof(foo));
+ err = copy_from_user(attr, (int *)arg, sizeof(*attr));
if (err)
return err;
if ( !OBT(obddev) || !OBP(obddev, setattr) )
return -EOPNOTSUPP;
- oa->i_ino = foo.ino;
- inode_setattr(oa, &foo.iattr);
- conn.oc_id = foo.conn_id;
- err = OBP(obddev, setattr)(&conn, oa);
- OBD_FREE(oa, sizeof(*oa));
+ conn.oc_id = attr->conn_id;
+ err = OBP(obddev, setattr)(&conn, &attr->obdo);
+ EXIT;
return err;
}
case OBD_IOC_GETATTR: {
- struct oic_getattr {
- unsigned int conn_id;
- unsigned long ino;
- } foo;
- struct iattr iattr;
- obdattr *oa;
-
- err = copy_from_user(&foo, (int *)arg, sizeof(foo));
+ struct oic_attr_s *attr = tmp_buf;
+
+ err = copy_from_user(attr, (int *)arg, sizeof(*attr));
if (err)
return err;
- conn.oc_id = foo.conn_id;
- oa = obd_oa_fromid(&conn, foo.ino);
- if ( !oa )
- return -ENOENT;
+ conn.oc_id = attr->conn_id;
+ ODEBUG(&attr->obdo);
+ err = OBP(obddev, getattr)(&conn, &attr->obdo);
+ if ( err ) {
+ EXIT;
+ return err;
+ }
- inode_to_iattr(oa, &iattr);
- err = copy_to_user((int *)arg, &iattr, sizeof(iattr));
+ err = copy_to_user((int *)arg, attr, sizeof(*attr));
+ EXIT;
return err;
}
case OBD_IOC_READ: {
- obdattr *oa = NULL;
int err;
- struct oic_rw_s rw_s; /* read, write ioctl str */
+ struct oic_rw_s *rw_s = tmp_buf; /* read, write ioctl str */
- err = copy_from_user(&rw_s, (int *)arg, sizeof(rw_s));
- if ( err )
- goto READ_OUT;
+ err = copy_from_user(rw_s, (int *)arg, sizeof(*rw_s));
+ if ( err ) {
+ EXIT;
+ return err;
+ }
- conn.oc_id = rw_s.conn_id;
- if ( ! (oa = obd_oa_fromid(&conn, rw_s.id)) )
- return -ENOENT;
+ conn.oc_id = rw_s->conn_id;
if ( !OBT(obddev) || !OBP(obddev, read) ) {
err = -EOPNOTSUPP;
- goto READ_OUT;
+ EXIT;
+ return err;
}
- err = OBP(obddev, read)(&conn, oa, rw_s.buf, &rw_s.count,
- rw_s.offset);
- if ( err )
- goto READ_OUT;
-
- err = copy_to_user((int*)arg, &rw_s.count, sizeof(rw_s.count));
- READ_OUT:
- if ( oa )
- OBD_FREE(oa, sizeof(*oa));
+ err = OBP(obddev, read)(&conn, &rw_s->obdo, rw_s->buf,
+ &rw_s->count, rw_s->offset);
+
+ ODEBUG(&rw_s->obdo);
+ CDEBUG(D_INFO, "READ: conn %d, count %Ld, offset %Ld, '%s'\n",
+ rw_s->conn_id, rw_s->count, rw_s->offset, rw_s->buf);
+ if ( err ) {
+ EXIT;
+ return err;
+ }
+
+ err = copy_to_user((int*)arg, &rw_s->count, sizeof(rw_s->count));
+ EXIT;
return err;
}
case OBD_IOC_WRITE: {
- obdattr *oa = NULL;
- struct oic_rw_s rw_s; /* read, write ioctl str */
+ struct oic_rw_s *rw_s = tmp_buf; /* read, write ioctl str */
- err = copy_from_user(&rw_s, (int *)arg, sizeof(rw_s));
- if ( err )
- goto WRITE_OUT;
+ err = copy_from_user(rw_s, (int *)arg, sizeof(*rw_s));
+ if ( err ) {
+ EXIT;
+ return err;
+ }
- conn.oc_id = rw_s.conn_id;
- oa = obd_oa_fromid(&conn, rw_s.id);
- if ( !oa )
- return -ENOENT;
+ conn.oc_id = rw_s->conn_id;
if ( !OBT(obddev) || !OBP(obddev, write) ) {
err = -EOPNOTSUPP;
- goto WRITE_OUT;
+ return err;
}
- err = OBP(obddev, write)(&conn, oa, rw_s.buf, &rw_s.count,
- rw_s.offset);
- if ( err )
- goto WRITE_OUT;
-
- err = copy_to_user((int*)arg, &rw_s.count, sizeof(rw_s.count));
+ CDEBUG(D_INFO, "WRITE: conn %d, count %Ld, offset %Ld, '%s'\n",
+ rw_s->conn_id, rw_s->count, rw_s->offset, rw_s->buf);
+ err = OBP(obddev, write)(&conn, &rw_s->obdo, rw_s->buf,
+ &rw_s->count, rw_s->offset);
+ ODEBUG(&rw_s->obdo);
+ if ( err ) {
+ EXIT;
+ return err;
+ }
- WRITE_OUT:
- OBD_FREE(oa, sizeof(*oa));
+ err = copy_to_user((int *)arg, &rw_s->count,
+ sizeof(rw_s->count));
+ EXIT;
return err;
}
case OBD_IOC_PREALLOCATE: {
- struct oic_prealloc_s prealloc;
+ struct oic_prealloc_s *prealloc = tmp_buf;
/* has this minor been registered? */
if (!obddev->obd_type)
return -ENODEV;
- err = copy_from_user(&prealloc, (int *)arg, sizeof(prealloc));
+ err = copy_from_user(prealloc, (int *)arg, sizeof(*prealloc));
if (err)
return -EFAULT;
if ( !OBT(obddev) || !OBP(obddev, preallocate) )
return -EOPNOTSUPP;
- conn.oc_id = prealloc.cli_id;
- err = OBP(obddev, preallocate)(&conn, &prealloc.alloc,
- prealloc.inodes);
- if ( err )
+ conn.oc_id = prealloc->conn_id;
+ err = OBP(obddev, preallocate)(&conn, &prealloc->alloc,
+ prealloc->ids);
+ if ( err ) {
+ EXIT;
return err;
+ }
- return copy_to_user((int *)arg, &prealloc, sizeof(prealloc));
+ err =copy_to_user((int *)arg, prealloc, sizeof(*prealloc));
+ EXIT;
+ return err;
}
case OBD_IOC_STATFS: {
struct statfs *tmp;
conn.oc_id = conn_id;
err = OBP(obddev, statfs)(&conn, &buf);
- if ( err )
+ if ( err ) {
+ EXIT;
return err;
+ }
err = copy_to_user(tmp, &buf, sizeof(buf));
+ EXIT;
return err;
}
+ case OBD_IOC_COPY: {
+ struct ioc_mv_s *mvdata = tmp_buf;
+
+ if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
+ (!(obddev->obd_flags & OBD_ATTACHED))) {
+ CDEBUG(D_IOCTL, "Device not attached or set up\n");
+ return -ENODEV;
+ }
+
+ /* get main structure */
+ err = copy_from_user(mvdata, (void *) arg, sizeof(*mvdata));
+ if (err) {
+ EXIT;
+ return err;
+ }
+
+ if ( !OBT(obddev) || !OBP(obddev, copy) )
+ return -EOPNOTSUPP;
+
+ /* do the partition */
+ CDEBUG(D_INFO, "Copy %d, type %s dst %Ld src %Ld\n", dev,
+ obddev->obd_type->typ_name, mvdata->dst.o_id,
+ mvdata->src.o_id);
+
+ conn.oc_id = mvdata->src_conn_id;
+
+ err = OBP(obddev, copy)(&conn, &mvdata->dst,
+ &conn, &mvdata->src,
+ mvdata->src.o_size, 0);
+ return err;
+ }
+
+ case OBD_IOC_MIGR: {
+ struct ioc_mv_s *mvdata = tmp_buf;
+
+ if ( (!(obddev->obd_flags & OBD_SET_UP)) ||
+ (!(obddev->obd_flags & OBD_ATTACHED))) {
+ CDEBUG(D_IOCTL, "Device not attached or set up\n");
+ return -ENODEV;
+ }
+
+ err = copy_from_user(mvdata, (void *) arg, sizeof(*mvdata));
+ if (err) {
+ EXIT;
+ return err;
+ }
+
+ CDEBUG(D_INFO, "Migrate copying %d bytes\n", sizeof(*mvdata));
+
+ if ( !OBT(obddev) || !OBP(obddev, migrate) )
+ return -EOPNOTSUPP;
+
+ /* do the partition */
+ CDEBUG(D_INFO, "Migrate %d, type %s conn %d src %Ld dst %Ld\n",
+ dev, obddev->obd_type->typ_name, mvdata->src_conn_id,
+ mvdata->src.o_id, mvdata->dst.o_id);
+
+ conn.oc_id = mvdata->src_conn_id;
+ err = OBP(obddev, migrate)(&conn, &mvdata->dst, &mvdata->src,
+ mvdata->src.o_size, 0);
+
+ return err;
+ }
+
default: {
struct obd_type *type;
struct oic_generic input;
+ char *nm;
void *karg;
/* get data structures */
}
/* find the type */
- type = obd_nm_to_type(input.att_type);
+ nm = input.att_type;
+ type = obd_nm_to_type(nm);
+#ifdef CONFIG_KMOD
+ if ( !type ) {
+ if ( !request_module(nm) ) {
+ CDEBUG(D_PSDEV, "Loaded module '%s'\n", nm);
+ type = obd_nm_to_type(nm);
+ } else {
+ CDEBUG(D_PSDEV, "Can't load module '%s'\n", nm);
+ }
+ }
+#endif
OBD_FREE(input.att_type, input.att_typelen + 1);
if ( !type ) {
- printk("Unknown obd type dev %d\n", dev);
+ printk(__FUNCTION__ ": unknown obd type dev %d\n", dev);
EXIT;
return -EINVAL;
}
}
conn.oc_id = input.att_connid;
- CDEBUG(D_IOCTL, "Calling ioctl %x for type %s, len %d\n",
+ CDEBUG(D_INFO, "Calling ioctl %x for type %s, len %d\n",
cmd, type->typ_name, input.att_datalen);
/* get the generic data */
return err;
}
}
-}
+} /* obd_class_ioctl */
/* Driver interface done, utility functions follow */
if (obd_init_magic != 0x11223344) {
+ printk(__FUNCTION__ ": bad magic for type\n");
EXIT;
return -EINVAL;
}
if ( !type ) {
MOD_DEC_USE_COUNT;
- printk("Unknown obd type\n");
+ printk(KERN_INFO __FUNCTION__ ": unknown obd type\n");
EXIT;
return -EINVAL;
}
if ( type->typ_refcnt ) {
MOD_DEC_USE_COUNT;
- printk("OBD: Type %s has refcount (%d)\n", nm,
- type->typ_refcnt);
+ printk(KERN_ALERT __FUNCTION__ ":type %s has refcount "
+ "(%d)\n", nm, type->typ_refcnt);
EXIT;
return -EBUSY;
}
OBD_FREE(type, sizeof(*type));
MOD_DEC_USE_COUNT;
return 0;
-}
+} /* obd_unregister_type */
/* declare character device */
static struct file_operations obd_psdev_fops = {
obd_class_release, /* release */
NULL, /* fsync */
NULL, /* fasync */
- NULL, /* check_media_change */
- NULL, /* revalidate */
NULL /* lock */
};
int init_obd(void)
{
+ int err;
int i;
- printk(KERN_INFO "OBD class driver v0.002, braam@stelias.com\n");
+ printk(KERN_INFO "OBD class driver v0.01, 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",
+ printk(KERN_ERR __FUNCTION__ ": unable to get major %d\n",
OBD_PSDEV_MAJOR);
return -EIO;
}
INIT_LIST_HEAD(&obd_dev[i].obd_gen_clients);
}
+ err = obd_init_obdo_cache();
+ if (err)
+ return err;
obd_sysctl_init();
obd_init_magic = 0x11223344;
return 0;
EXPORT_SYMBOL(gen_cleanup);
EXPORT_SYMBOL(gen_disconnect);
EXPORT_SYMBOL(gen_copy_data);
+EXPORT_SYMBOL(obdo_cachep);
/* EXPORT_SYMBOL(gen_multi_attach); */
EXPORT_SYMBOL(gen_multi_setup);
}
}
-
+ obd_cleanup_obdo_cache();
obd_sysctl_clean();
+ CDEBUG(D_MALLOC, "CLASS mem used %ld\n", obd_memory);
obd_init_magic = 0;
+ EXIT;
}
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff