Whamcloud - gitweb
Lproc-snmp code drop
[fs/lustre-release.git] / lustre / obdclass / class_obd.c
index 893162c..2569fb2 100644 (file)
@@ -1,30 +1,15 @@
-/*
- *              An implementation of a loadable kernel mode driver providing
- *              multiple kernel/user space bidirectional communications links.
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *              Author:         Alan Cox <alan@cymru.net>
+ * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              version 2 as published by the Free Software Foundation.
- * 
- *              Adapted to become the Linux 2.0 Coda pseudo device
- *              Peter  Braam  <braam@maths.ox.ac.uk> 
- *              Michael Callahan <mjc@emmy.smith.edu>           
+ * This code is issued under the GNU General Public License.
+ * See the file COPYING in this distribution
  *
- *              Changes for Linux 2.1
- *              Copyright (c) 1997 Carnegie-Mellon University
+ * These are the only exported functions, they provide some generic
+ * infrastructure for managing object devices
  *
- *              Redone again for Intermezzo
- *              Copyright (c) 1998 Peter J. Braam
- *
- *              Hacked up again for simulated OBD
- *              Copyright (c) 1999 Stelias Computing, Inc.
- *                (authors {pschwan,braam}@stelias.com)
- *              Copyright (C) 1999 Seagate Technology, Inc.
- *              Copyright (C) 2001 Cluster File Systems, Inc.
- *
- * 
+ * Object Devices Class Driver
  */
 
 #define EXPORT_SYMTAB
@@ -33,7 +18,6 @@
 #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/slab.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/proc_fs.h>
-#include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/poll.h>
 #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/miscdevice.h>
 
+#define DEBUG_SUBSYSTEM S_CLASS
+
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
+#include <linux/lustre_debug.h>
+#include <linux/smp_lock.h>
+#include <linux/lprocfs_status.h>
 
-static int obd_init_magic;
-int obd_print_entry = 1;
-int obd_debug_level = ~0;
-long obd_memory = 0;
+struct semaphore obd_conf_sem;   /* serialize configuration commands */
 struct obd_device obd_dev[MAX_OBD_DEVICES];
 struct list_head obd_types;
+unsigned long obd_memory;
+
+/* The following are visible and mutable through /proc/sys/lustre/. */
+unsigned long obd_fail_loc;
+unsigned long obd_timeout = 100;
+char obd_recovery_upcall[128] = "/usr/lib/lustre/ha_assist";
+
+extern struct obd_type *class_nm_to_type(char *nm);
 
 /*  opening /dev/obd */
 static int obd_class_open(struct inode * inode, struct file * file)
 {
         ENTRY;
 
-       file->private_data = NULL;
+        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;
-        EXIT;
-        return 0;
+        RETURN(0);
 }
 
 /*  closing /dev/obd */
@@ -79,704 +74,576 @@ static int obd_class_release(struct inode * inode, struct file * file)
 {
         ENTRY;
 
-       if (file->private_data)
-               file->private_data = NULL;
+        // 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;
-        EXIT;
-        return 0;
+        RETURN(0);
 }
 
-/* 
- * support functions: we could use inter-module communication, but this 
- * is more portable to other OS's
- */
-static struct obd_type *obd_search_type(char *nm)
+
+inline void obd_data2conn(struct lustre_handle *conn, struct obd_ioctl_data *data)
 {
-        struct list_head *tmp;
-        struct obd_type *type;
-        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_INFO, "TYP %s\n", type->typ_name);
-                if (strlen(type->typ_name) == strlen(nm) &&
-                    strcmp(type->typ_name, nm) == 0 ) {
-                        return type;
-                }
-        }
-       return NULL;
+        conn->addr = data->ioc_addr;
+        conn->cookie = data->ioc_cookie;
+}
+
+
+inline void obd_conn2data(struct obd_ioctl_data *data, struct lustre_handle *conn)
+{
+        data->ioc_addr = conn->addr;
+        data->ioc_cookie = conn->cookie;
 }
 
-static struct obd_type *obd_nm_to_type(char *nm) 
+static void forcibly_detach_exports(struct obd_device *obd)
 {
-        struct obd_type *type = obd_search_type(nm);
-
-#ifdef CONFIG_KMOD
-       if ( !type ) {
-               if ( !request_module(nm) ) {
-                       CDEBUG(D_PSDEV, "Loaded module '%s'\n", nm);
-                       type = obd_search_type(nm);
-               } else {
-                       CDEBUG(D_PSDEV, "Can't load module '%s'\n", nm);
-               }
-       }
-#endif
-        return type;
+        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, 
+static int obd_class_ioctl (struct inode * inode, struct file * filp,
                             unsigned int cmd, unsigned long arg)
 {
-        /* NOTE this must be larger than any of the ioctl data structs */
-        char buf[1024];
-       struct obd_ioctl_data *data;
-       struct obd_device *obd = filp->private_data;
-       struct obd_conn conn;
+        char *buf = NULL;
+        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;
-       ENTRY;
+        int serialised = 0;
 
-       memset(buf, 0, sizeof(buf));
+        ENTRY;
 
-       if (!obd && cmd != OBD_IOC_DEVICE && cmd != TCGETS) {
-               printk("OBD ioctl: No device\n");
-               return -EINVAL;
-       } 
-       if (obd_ioctl_getdata(buf, buf + 800, (void *)arg)) { 
-               printk("OBD ioctl: data error\n");
-               return -EINVAL;
-       }
-       data = (struct obd_ioctl_data *)buf;
+        switch (cmd)
+        {
+        case OBD_IOC_BRW_WRITE:
+        case OBD_IOC_BRW_READ:
+        case OBD_IOC_GETATTR:
+                break;
+        default:
+                down(&obd_conf_sem);
+                serialised = 1;
+                break;
+        }
+
+        if (!obd && cmd != OBD_IOC_DEVICE && cmd != TCGETS &&
+            cmd != OBD_IOC_LIST &&
+            cmd != OBD_IOC_NAME2DEV && cmd != OBD_IOC_NEWDEV) {
+                CERROR("OBD ioctl: No device\n");
+                GOTO(out, err=-EINVAL);
+        }
+        if (obd_ioctl_getdata(&buf, &len, (void *)arg)) {
+                CERROR("OBD ioctl: data error\n");
+                GOTO(out, err=-EINVAL);
+        }
+        data = (struct obd_ioctl_data *)buf;
 
         switch (cmd) {
-        case TCGETS: { 
-               EXIT;
-                return -EINVAL;
-       }
-       case OBD_IOC_DEVICE: { 
-               CDEBUG(D_IOCTL, "\n");
-               if (data->ioc_dev >= MAX_OBD_DEVICES ||
-                   data->ioc_dev < 0) { 
-                       printk("OBD ioctl: DEVICE insufficient devices\n");
-                       return -EINVAL;
-               }
-               CDEBUG(D_IOCTL, "device %d\n", data->ioc_dev);
-
-               filp->private_data = &obd_dev[data->ioc_dev];
-               EXIT;
-               return 0;
-       }
+        case TCGETS:
+                GOTO(out, err=-EINVAL);
+        case OBD_IOC_DEVICE: {
+                CDEBUG(D_IOCTL, "\n");
+                if (data->ioc_dev >= MAX_OBD_DEVICES || data->ioc_dev < 0) {
+                        CERROR("OBD ioctl: DEVICE insufficient devices\n");
+                        GOTO(out, err=-EINVAL);
+                }
+                CDEBUG(D_IOCTL, "device %d\n", data->ioc_dev);
+
+                filp->private_data = &obd_dev[data->ioc_dev];
+                GOTO(out, err=0);
+        }
+
+        case OBD_IOC_LIST: {
+                int i;
+                char *buf2 = data->ioc_bulk;
+                int remains = data->ioc_inllen1;
+
+                if (!data->ioc_inlbuf1) {
+                        CERROR("No buffer passed!\n");
+                        GOTO(out, err=-EINVAL);
+                }
+
+
+                for (i = 0 ; i < MAX_OBD_DEVICES ; i++) {
+                        int l;
+                        char *status;
+                        struct obd_device *obd = &obd_dev[i];
+                        if (!obd->obd_type)
+                                continue;
+                        if (obd->obd_flags & OBD_SET_UP)
+                                status = "UP";
+                        else if (obd->obd_flags & OBD_ATTACHED)
+                                status = "AT";
+                        else
+                                status = "-";
+                        l = snprintf(buf2, remains, "%2d %s %s %s %s %d\n",
+                                     i, status, obd->obd_type->typ_name,
+                                     obd->obd_name, obd->obd_uuid, obd->obd_type->typ_refcnt);
+                        buf2 +=l;
+                        remains -=l;
+                        if (remains <= 0) {
+                                CERROR("not enough space for device listing\n");
+                                break;
+                        }
+                }
+
+                err = copy_to_user((void *)arg, data, len);
+                GOTO(out, err);
+        }
+
+
+        case OBD_IOC_NAME2DEV: {
+                /* Resolve a device name.  This does not change the
+                 * currently selected device.
+                 */
+                int dev;
+
+                if (!data->ioc_inllen1 || !data->ioc_inlbuf1 ) {
+                        CERROR("No name passed,!\n");
+                        GOTO(out, err=-EINVAL);
+                }
+                if (data->ioc_inlbuf1[data->ioc_inllen1-1] !=0) {
+                        CERROR("Name not nul terminated!\n");
+                        GOTO(out, err=-EINVAL);
+                }
+
+                CDEBUG(D_IOCTL, "device name %s\n", data->ioc_inlbuf1);
+                dev = class_name2dev(data->ioc_inlbuf1);
+                data->ioc_dev = dev;
+                if (dev == -1) {
+                        CDEBUG(D_IOCTL, "No device for name %s!\n",
+                               data->ioc_inlbuf1);
+                        GOTO(out, err=-EINVAL);
+                }
+
+                CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1,
+                       dev);
+                err = copy_to_user((void *)arg, data, sizeof(*data));
+                GOTO(out, err);
+        }
+
+        case OBD_IOC_UUID2DEV: {
+                /* Resolve a device uuid.  This does not change the
+                 * currently selected device.
+                 */
+                int dev;
+
+                if (!data->ioc_inllen1 || !data->ioc_inlbuf1) {
+                        CERROR("No UUID passed!\n");
+                        GOTO(out, err=-EINVAL);
+                }
+                if (data->ioc_inlbuf1[data->ioc_inllen1-1] !=0) {
+                        CERROR("Name not nul terminated!\n");
+                        GOTO(out, err=-EINVAL);
+                }
+
+                CDEBUG(D_IOCTL, "device name %s\n", data->ioc_inlbuf1);
+                dev = class_uuid2dev(data->ioc_inlbuf1);
+                data->ioc_dev = dev;
+                if (dev == -1) {
+                        CDEBUG(D_IOCTL, "No device for name %s!\n",
+                               data->ioc_inlbuf1);
+                        GOTO(out, err=-EINVAL);
+                }
+
+                CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1,
+                       dev);
+                err = copy_to_user((void *)arg, data, sizeof(*data));
+                GOTO(out, err);
+        }
+
+        case OBD_IOC_NEWDEV: {
+                int dev = -1;
+                int i;
+
+                filp->private_data = NULL;
+                for (i = 0 ; i < MAX_OBD_DEVICES ; i++) {
+                        struct obd_device *obd = &obd_dev[i];
+                        if (!obd->obd_type) {
+                                filp->private_data = obd;
+                                dev = i;
+                                break;
+                        }
+                }
+
+
+                data->ioc_dev = dev;
+                if (dev == -1)
+                        GOTO(out, err=-EINVAL);
+
+                err = copy_to_user((void *)arg, data, sizeof(*data));
+                GOTO(out, err);
+        }
 
         case OBD_IOC_ATTACH: {
                 struct obd_type *type;
+                int minor;
 
-                ENTRY;
                 /* have we attached a type to this device */
-                if ( obd->obd_flags & OBD_ATTACHED ) {
-                        printk("OBD: Device %d already typed as  %s.\n",
+                if (obd->obd_flags & OBD_ATTACHED || obd->obd_type) {
+                        CERROR("OBD: Device %d already typed as %s.\n",
                                obd->obd_minor, MKSTR(obd->obd_type->typ_name));
-                        return -EBUSY;
+                        GOTO(out, err=-EBUSY);
                 }
 
-               printk("-----> attach %s %s\n",  MKSTR(data->ioc_inlbuf1), 
-                      MKSTR(data->ioc_inlbuf2));
+                if (!data->ioc_inllen1 || !data->ioc_inlbuf1) {
+                        CERROR("No type passed!\n");
+                        GOTO(out, err=-EINVAL);
+                }
+                if (data->ioc_inlbuf1[data->ioc_inllen1-1] !=0) {
+                        CERROR("Type not nul terminated!\n");
+                        GOTO(out, err=-EINVAL);
+                }
+
+                CDEBUG(D_IOCTL, "attach type %s name: %s uuid: %s\n",
+                       MKSTR(data->ioc_inlbuf1),
+                       MKSTR(data->ioc_inlbuf2), MKSTR(data->ioc_inlbuf3));
 
                 /* find the type */
-                type = obd_nm_to_type(data->ioc_inlbuf1);
-                if ( !type ) {
-                        printk("OBD: unknown type dev %d\n", obd->obd_minor);
-                        return -EINVAL;
+                type = class_nm_to_type(data->ioc_inlbuf1);
+                if (!type) {
+                        CERROR("OBD: unknown type dev %d\n", obd->obd_minor);
+                        GOTO(out, err=-EINVAL);
                 }
 
+                minor = obd->obd_minor;
+                memset(obd, 0, sizeof(*obd));
+                obd->obd_minor = minor;
                 obd->obd_type = type;
-                obd->obd_multi_count = 0;
-                INIT_LIST_HEAD(&obd->obd_gen_clients);
-
+                INIT_LIST_HEAD(&obd->obd_exports);
+                INIT_LIST_HEAD(&obd->obd_imports);
+                spin_lock_init(&obd->obd_dev_lock);
+
+                        if (data->ioc_inlbuf2) {
+                                int len = strlen(data->ioc_inlbuf2) + 1;
+                                OBD_ALLOC(obd->obd_name, len);
+                                if (!obd->obd_name) {
+                                        CERROR("no memory\n");
+                                        LBUG();
+                                }
+                                memcpy(obd->obd_name, data->ioc_inlbuf2, len);
+                        } else {
+                                CERROR("WARNING: unnamed obd device\n");
+                        }
+                        if (data->ioc_inlbuf3) {
+                                int len = strlen(data->ioc_inlbuf3);
+                                if (len >= sizeof(obd->obd_uuid)) {
+                                        CERROR("uuid must be < %d bytes long\n",
+                                               sizeof(obd->obd_uuid));
+                                        if (obd->obd_name)
+                                                OBD_FREE(obd->obd_name,
+                                                         strlen(obd->obd_name) + 1);
+                                        GOTO(out, err=-EINVAL);
+                                }
+                                memcpy(obd->obd_uuid, data->ioc_inlbuf3, len);
+                        }
                 /* do the attach */
-                if ( OBT(obd) && OBP(obd, attach) ) {
-                       err = OBP(obd, attach)(obd, sizeof(*data), data);
-               }
-
-                if ( err ) {
+                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;
-                        EXIT;
-                } else {
-                        obd->obd_flags |=  OBD_ATTACHED;
+
+                        } else {
+                        obd->obd_flags |= OBD_ATTACHED;
+
                         type->typ_refcnt++;
-                        printk("OBD: dev %d attached type %s\n", 
-                              obd->obd_minor, data->ioc_inlbuf1);
-                       obd->obd_proc_entry = 
-                               proc_lustre_register_obd_device(obd);
+                        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;
-                        EXIT;
                 }
 
-                return err;
+                GOTO(out, err);
         }
 
         case OBD_IOC_DETACH: {
                 ENTRY;
                 if (obd->obd_flags & OBD_SET_UP) {
-                        printk("OBD device %d still set up\n", obd->obd_minor);
-                        return -EBUSY;
-                }
-                if (! (obd->obd_flags & OBD_ATTACHED) ) {
-                        printk("OBD device %d not attached\n", obd->obd_minor);
-                        return -ENODEV;
-                }
-                if ( !list_empty(&obd->obd_gen_clients) ) {
-                        printk("OBD device %d has connected clients\n", obd->obd_minor);
-                        return -EBUSY;
+                        CERROR("OBD device %d still set up\n", obd->obd_minor);
+                        GOTO(out, err=-EBUSY);
+                }
+                if (!(obd->obd_flags & OBD_ATTACHED) ) {
+                        CERROR("OBD device %d not attached\n", obd->obd_minor);
+                        GOTO(out, err=-ENODEV);
+                }
+                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_proc_entry)
-                       proc_lustre_release_obd_device(obd);
+                if (obd->obd_name) {
+                        OBD_FREE(obd->obd_name, strlen(obd->obd_name)+1);
+                        obd->obd_name = NULL;
+                }
 
                 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;
-                EXIT;
-                return 0;
+                GOTO(out, err = 0);
         }
 
         case OBD_IOC_SETUP: {
-                ENTRY;
                 /* have we attached a type to this device? */
                 if (!(obd->obd_flags & OBD_ATTACHED)) {
-                        printk("Device %d not attached\n", obd->obd_minor);
-                        return -ENODEV;
+                        CERROR("Device %d not attached\n", obd->obd_minor);
+                        GOTO(out, err=-ENODEV);
                 }
 
                 /* has this been done already? */
                 if ( obd->obd_flags & OBD_SET_UP ) {
-                        printk("Device %d already setup (type %s)\n",
+                        CERROR("Device %d already setup (type %s)\n",
                                obd->obd_minor, obd->obd_type->typ_name);
-                        return -EBUSY;
+                        GOTO(out, err=-EBUSY);
                 }
 
                 if ( OBT(obd) && OBP(obd, setup) )
-                       err = OBP(obd, setup)(obd, sizeof(*data), data);
+                        err = obd_setup(obd, sizeof(*data), data);
 
-               if (!err) { 
-                       obd->obd_type->typ_refcnt++;
-                       obd->obd_flags |= OBD_SET_UP;
-                       EXIT;
-               }
+                if (!err) {
+                        obd->obd_type->typ_refcnt++;
+                        obd->obd_flags |= OBD_SET_UP;
+                }
 
-                return err;
+                GOTO(out, err);
         }
         case OBD_IOC_CLEANUP: {
-                ENTRY;
+                /* have we attached a type to this device? */
+                if (!(obd->obd_flags & OBD_ATTACHED)) {
+                        CERROR("Device %d not attached\n", obd->obd_minor);
+                        GOTO(out, err=-ENODEV);
+                }
 
-               if ( !(obd->obd_flags & OBD_SET_UP) ) {
-                       EXIT;
-                       return -EINVAL;
-               }
+                if ( OBT(obd) && OBP(obd, cleanup) )
+                        err = obd_cleanup(obd);
 
-                err = obd_cleanup(obd);
-                if ( err ) {
-                        EXIT;
-                        return err;
+                if (!err) {
+                        obd->obd_flags &= ~OBD_SET_UP;
+                        obd->obd_type->typ_refcnt--;
                 }
-
-                obd->obd_flags &= ~OBD_SET_UP;
-                obd->obd_type->typ_refcnt--;
-                EXIT;
-                return 0;
+                GOTO(out, err);
         }
 
-        case OBD_IOC_CONNECT:
-        {
-               conn.oc_id = data->ioc_conn1;
-               conn.oc_dev = obd; 
+        case OBD_IOC_CONNECT: {
+                char * cluuid = "OBD_CLASS_UUID";
+                obd_data2conn(&conn, data);
 
-                err = obd_connect(&conn);
+                err = obd_connect(&conn, obd, cluuid, NULL, NULL);
 
-               CDEBUG(D_IOCTL, "assigned connection %d\n", conn.oc_id);
-               data->ioc_conn1 = conn.oc_id;
-                if ( err )
-                        return err;
+                CDEBUG(D_IOCTL, "assigned export "LPX64"\n", conn.addr);
+                obd_conn2data(data, &conn);
+                if (err)
+                        GOTO(out, err);
 
-                return 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_DISCONNECT: { 
-               conn.oc_id = data->ioc_conn1;
-               conn.oc_dev = obd;
-
+        case OBD_IOC_DISCONNECT: {
+                obd_data2conn(&conn, data);
                 err = obd_disconnect(&conn);
-                return err;
-       }               
+                GOTO(out, err);
+        }
 
-       case OBD_IOC_DEC_USE_COUNT: { 
-               MOD_DEC_USE_COUNT;
-               return 0;
-       }
+        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: {
-                conn.oc_id = data->ioc_conn1;
-               conn.oc_dev = obd;
-
-                err = obd_create(&conn, &data->ioc_obdo1);
-                if (err) {
-                        EXIT;
-                        return err;
-                }
-
-                err = copy_to_user((int *)arg, data, sizeof(*data));
-                EXIT;
-                return err;
+                struct lov_stripe_md *lsm = NULL;
+                obd_data2conn(&conn, 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);
         }
 
         case OBD_IOC_GETATTR: {
-                conn.oc_id = data->ioc_conn1;
-               conn.oc_dev = obd;
 
-                err = obd_getattr(&conn, &data->ioc_obdo1);
-                if (err) {
-                        EXIT;
-                        return err;
-                }
-
-                err = copy_to_user((int *)arg, data, sizeof(*data));
-                EXIT;
-                return err;
+                obd_data2conn(&conn, data);
+                err = obd_getattr(&conn, &data->ioc_obdo1, NULL);
+                if (!err)
+                        err = copy_to_user((void *)arg, data, sizeof(*data));
+                GOTO(out, err);
         }
 
         case OBD_IOC_SETATTR: {
-                conn.oc_id = data->ioc_conn1;
-               conn.oc_dev = obd;
-
-                err = obd_setattr(&conn, &data->ioc_obdo1);
-                if (err) {
-                        EXIT;
-                        return err;
-                }
-
-                err = copy_to_user((int *)arg, data, sizeof(*data));
-                EXIT;
-                return err;
-       }
-
-        case OBD_IOC_DESTROY: {
-                conn.oc_id = data->ioc_conn1;
-               conn.oc_dev = obd;
-
-                err = obd_destroy(&conn, &data->ioc_obdo1);
-                if (err) {
-                        EXIT;
-                        return err;
-                }
-
-                err = copy_to_user((int *)arg, data, sizeof(*data));
-                EXIT;
-                return err;
-       }
-
-#if 0
-        case OBD_IOC_MODULE_DEBUG:
-        {
-               struct module *mod = module_list;
-               char *tmp = data->ioc_inlbuf1;
-               char line[128];
-
-               snprintf(line, 128, "symbol-file\n"
-                        "symbol-file /usr/src/lum/linux\n"
-                        "b panic\n"
-                        "b stop\n"); 
-               tmp += strlen(line); 
-
-               do { 
-                       sprintf(line, 
-                               "add-symbol-file /usr/src/obd/%s/%s.o %p\n",
-                               mod->name, mod->name, mod); 
-                       memcpy(tmp, line, strlen(line));
-                       tmp += strlen(line); 
-               } while ( mod->next != NULL)
-
-                return copy_to_user((int *)arg, data, sizeof(*data) + 
-                                   data->ioc_inllen1);
-        }
-
-        case OBD_IOC_SYNC: {
-                struct oic_range_s *range = tmp_buf;
-
-                if (!obd->obd_type)
-                        return -ENODEV;
-
-                err = copy_from_user(range, (const void *)arg,  sizeof(*range));
-
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
-                        
-                if ( !OBT(obd) || !OBP(obd, sync) ) {
-                        err = -EOPNOTSUPP;
-                        EXIT;
-                        return err;
-                }
-
-                /* XXX sync needs to be tested/verified */
-                err = OBP(obd, sync)(&conn, &range->obdo, range->count,
-                                        range->offset);
-
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
-                        
-                return put_user(err, (int *) arg);
+                obd_data2conn(&conn, data);
+                err = obd_setattr(&conn, &data->ioc_obdo1, NULL);
+                if (!err)
+                        err = copy_to_user((void *)arg, data, sizeof(*data));
+                GOTO(out, err);
         }
 
-        case OBD_IOC_READ: {
-                int err;
-                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 ) {
-                        EXIT;
-                        return err;
-                }
-
-                conn.oc_id = rw_s->conn_id;
-
-                if ( !OBT(obd) || !OBP(obd, read) ) {
-                        err = -EOPNOTSUPP;
-                        EXIT;
-                        return err;
-                }
-
+        case OBD_IOC_DESTROY: {
+                //void *ea;
+                obd_data2conn(&conn, data);
 
-                err = OBP(obd, 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;
+                err = obd_destroy(&conn, &data->ioc_obdo1, NULL);
+                if (!err)
+                        err = copy_to_user((void *)arg, data, sizeof(*data));
+                GOTO(out, err);
         }
 
-        case OBD_IOC_WRITE: {
-                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 ) {
-                        EXIT;
-                        return err;
-                }
+        case OBD_IOC_OPEN: {
+                struct lov_stripe_md *lsm = NULL; // XXX fill in from create
 
-                conn.oc_id = rw_s->conn_id;
-
-                if ( !OBT(obd) || !OBP(obd, write) ) {
-                        err = -EOPNOTSUPP;
-                        return err;
-                }
-
-                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(obd, write)(&conn, &rw_s->obdo, rw_s->buf, 
-                                         &rw_s->count, rw_s->offset);
-                ODEBUG(&rw_s->obdo);
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
-
-                err = copy_to_user((int *)arg, &rw_s->count,
-                                   sizeof(rw_s->count));
-                EXIT;
-                return err;
+                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_PREALLOCATE: {
-                struct oic_prealloc_s *prealloc = tmp_buf;
 
-                /* has this minor been registered? */
-                if (!obd->obd_type)
-                        return -ENODEV;
+        case OBD_IOC_CLOSE: {
+                struct lov_stripe_md *lsm = NULL; // XXX fill in from create
 
-                err = copy_from_user(prealloc, (int *)arg, sizeof(*prealloc));
-                if (err) 
-                        return -EFAULT;
-
-                if ( !(obd->obd_flags & OBD_ATTACHED) ||
-                     !(obd->obd_flags & OBD_SET_UP)) {
-                        CDEBUG(D_IOCTL, "Device not attached or set up\n");
-                        return -ENODEV;
-                }
-
-                if ( !OBT(obd) || !OBP(obd, preallocate) )
-                        return -EOPNOTSUPP;
-
-                conn.oc_id = prealloc->conn_id;
-                err = OBP(obd, preallocate)(&conn, &prealloc->alloc,
-                                               prealloc->ids);
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
-
-                err =copy_to_user((int *)arg, prealloc, sizeof(*prealloc));
-                EXIT;
-                return err;
+                obd_data2conn(&conn, data);
+                err = obd_close(&conn, &data->ioc_obdo1, lsm);
+                GOTO(out, err);
         }
-        case OBD_IOC_STATFS: {
-                struct statfs *tmp;
-                unsigned int conn_id;
-                struct statfs buf;
-
-                /* has this minor been registered? */
-                if (!obd->obd_type)
-                        return -ENODEV;
-
-                tmp = (void *)arg + sizeof(unsigned int);
-                get_user(conn_id, (int *) arg);
-
-                if ( !OBT(obd) || !OBP(obd, statfs) )
-                        return -EOPNOTSUPP;
-
-                conn.oc_id = conn_id;
-                err = OBP(obd, statfs)(&conn, &buf);
-                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 ( (!(obd->obd_flags & OBD_SET_UP)) ||
-                     (!(obd->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(obd) || !OBP(obd, copy) )
-                        return -EOPNOTSUPP;
-
-                /* do the partition */
-                CDEBUG(D_INFO, "Copy %d, type %s dst %Ld src %Ld\n", dev, 
-                       obd->obd_type->typ_name, mvdata->dst.o_id, 
-                       mvdata->src.o_id);
-
-                conn.oc_id = mvdata->src_conn_id;
-
-                err = OBP(obd, 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 ( (!(obd->obd_flags & OBD_SET_UP)) ||
-                     (!(obd->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(obd) || !OBP(obd, migrate) )
-                        return -EOPNOTSUPP;
-
-                /* do the partition */
-                CDEBUG(D_INFO, "Migrate %d, type %s conn %d src %Ld dst %Ld\n",
-                       dev, obd->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(obd, migrate)(&conn, &mvdata->dst, &mvdata->src, 
-                                           mvdata->src.o_size, 0);
-
-                return err;
-        }
-        case OBD_IOC_PUNCH: {
-                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 ) {
-                        EXIT;
-                        return err;
-                }
-
-                conn.oc_id = rw_s->conn_id;
-
-                if ( !OBT(obd) || !OBP(obd, punch) ) {
-                        err = -EOPNOTSUPP;
-                        return err;
+        case OBD_IOC_BRW_WRITE:
+                rw = OBD_BRW_WRITE;
+        case OBD_IOC_BRW_READ: {
+                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);
+                __u64 off;
+                int j;
+
+                if (!cbd)
+                        GOTO(out, err = -ENOMEM);
+
+                obd_data2conn(&conn, data);
+
+                pages = data->ioc_count / PAGE_SIZE;
+                off = data->ioc_offset;
+
+                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(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);
+                        if (!pgp->pg) {
+                                CERROR("no memory for brw pages\n");
+                                GOTO(brw_cleanup, err = -ENOMEM);
+                        }
+                        pgp->count = PAGE_SIZE;
+                        pgp->off = off;
+                        pgp->flag = 0;
+
+                        if (verify) {
+                                void *addr = kmap(pgp->pg);
+
+                                if (rw == OBD_BRW_WRITE)
+                                        page_debug_setup(addr, pgp->count,
+                                                         pgp->off, id);
+                                else
+                                        page_debug_setup(addr, pgp->count,
+                                                         0xdeadbeef00c0ffee,
+                                                         0xdeadbeef00c0ffee);
+                                kunmap(pgp->pg);
+                        }
                 }
 
-                CDEBUG(D_INFO, "PUNCH: conn %d, count %Ld, offset %Ld\n",
-                       rw_s->conn_id, rw_s->count, rw_s->offset);
-                err = OBP(obd, punch)(&conn, &rw_s->obdo, rw_s->count,
-                                         rw_s->offset);
-                ODEBUG(&rw_s->obdo);
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
+                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;
-                return err;
-        }
-
-        default: {
-                struct obd_type *type;
-                struct oic_generic input;
-                char *nm;
-                void *karg;
-
-                /* get data structures */
-                err = copy_from_user(&input, (void *)arg, sizeof(input));
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
-
-                err = getdata(input.att_typelen + 1, &input.att_type);
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
-
-                /* find the 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);
+        brw_cleanup:
+                for (j = 0, pgp = pga; j < pages; j++, pgp++) {
+                        if (pgp->pg != NULL) {
+                                if (verify && !err) {
+                                        void *addr = kmap(pgp->pg);
+
+                                        err = page_debug_check("test_brw",
+                                                               addr,
+                                                               PAGE_SIZE,
+                                                               pgp->off,id);
+                                        kunmap(pgp->pg);
+                                }
+                                __free_pages(pgp->pg, 0);
                         }
                 }
-#endif
-                OBD_FREE(input.att_type, input.att_typelen + 1);
-                if ( !type ) {
-                        printk(__FUNCTION__ ": unknown obd type dev %d\n", dev);
-                        EXIT;
-                        return -EINVAL;
-                }
-                
-                if ( !type->typ_ops || !type->typ_ops->o_iocontrol ) {
-                        EXIT;
-                        return -EOPNOTSUPP;
-                }
-                conn.oc_id = input.att_connid;
-                
-                CDEBUG(D_INFO, "Calling ioctl %x for type %s, len %d\n",
-                       cmd, type->typ_name, input.att_datalen);
-
-                /* get the generic data */
-                karg = input.att_data;
-                err = getdata(input.att_datalen, &karg);
-                if ( err ) {
-                        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;
+        brw_free:
+                OBD_FREE(pga, pages * sizeof(*pga));
+                GOTO(out, err);
         }
-#endif 
-       default:
-               return -EINVAL;
-
-        }
-} /* obd_class_ioctl */
-
-
-/* Driver interface done, utility functions follow */
-int obd_register_type(struct obd_ops *ops, char *nm)
-{
-        struct obd_type *type;
+        default:
+                obd_data2conn(&conn, data);
 
+                err = obd_iocontrol(cmd, &conn, len, data, NULL);
+                if (err)
+                        GOTO(out, err);
 
-        if (obd_init_magic != 0x11223344) {
-                printk(__FUNCTION__ ": bad magic for type\n");
-                EXIT;
-                return -EINVAL;
+                err = copy_to_user((void *)arg, data, len);
+                GOTO(out, err);
         }
 
-        if  ( obd_nm_to_type(nm) ) {
-                CDEBUG(D_IOCTL, "Type %s already registered\n", nm);
-                EXIT;
-                return -EEXIST;
-        }
-        
-        OBD_ALLOC(type, struct obd_type * , sizeof(*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;
-}
-        
-int obd_unregister_type(char *nm)
-{
-        struct obd_type *type = obd_nm_to_type(nm);
+ out:
+        if (buf)
+                OBD_FREE(buf, len);
+        if (serialised)
+                up(&obd_conf_sem);
+        RETURN(err);
+} /* obd_class_ioctl */
 
-        if ( !type ) {
-                MOD_DEC_USE_COUNT;
-                printk(KERN_INFO __FUNCTION__ ": unknown obd type\n");
-                EXIT;
-                return -EINVAL;
-        }
 
-        if ( type->typ_refcnt ) {
-                MOD_DEC_USE_COUNT;
-                printk(KERN_ALERT __FUNCTION__ ":type %s has refcount "
-                       "(%d)\n", nm, type->typ_refcnt);
-                EXIT;
-                return -EBUSY;
-        }
-
-        list_del(&type->typ_chain);
-        OBD_FREE(type, sizeof(*type));
-        MOD_DEC_USE_COUNT;
-        return 0;
-} /* obd_unregister_type */
 
 /* declare character device */
 static struct file_operations obd_psdev_fops = {
@@ -785,7 +652,6 @@ static struct file_operations obd_psdev_fops = {
         release: obd_class_release,     /* release */
 };
 
-
 /* modules setup */
 #define OBD_MINOR 241
 static struct miscdevice obd_psdev = {
@@ -794,80 +660,98 @@ static struct miscdevice obd_psdev = {
         &obd_psdev_fops
 };
 
-int init_obd(void)
+void (*class_signal_connection_failure)(struct ptlrpc_connection *);
+
+EXPORT_SYMBOL(obd_dev);
+EXPORT_SYMBOL(obdo_cachep);
+EXPORT_SYMBOL(obd_memory);
+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_name2dev);
+EXPORT_SYMBOL(class_uuid2dev);
+EXPORT_SYMBOL(class_uuid2obd);
+EXPORT_SYMBOL(class_new_export);
+EXPORT_SYMBOL(class_destroy_export);
+EXPORT_SYMBOL(class_connect);
+EXPORT_SYMBOL(class_conn2export);
+EXPORT_SYMBOL(class_conn2obd);
+EXPORT_SYMBOL(class_conn2cliimp);
+EXPORT_SYMBOL(class_conn2ldlmimp);
+EXPORT_SYMBOL(class_disconnect);
+EXPORT_SYMBOL(class_disconnect_all);
+//EXPORT_SYMBOL(class_uuid_parse);
+EXPORT_SYMBOL(class_uuid_unparse);
+//EXPORT_SYMBOL(class_multi_setup);
+//EXPORT_SYMBOL(class_multi_cleanup);
+
+EXPORT_SYMBOL(class_signal_connection_failure);
+EXPORT_SYMBOL(ll_sync_io_cb);
+EXPORT_SYMBOL(ll_init_cb);
+EXPORT_SYMBOL(class_nm_to_type);
+
+static int __init init_obdclass(void)
 {
+        struct obd_device *obd;
         int err;
         int i;
 
-        printk(KERN_INFO "OBD class driver  v0.01, braam@stelias.com\n");
-        
+        printk(KERN_INFO "OBD class driver  v0.9, info@clusterfs.com\n");
+
+        sema_init(&obd_conf_sem, 1);
         INIT_LIST_HEAD(&obd_types);
-        
-       if ( (err = misc_register(&obd_psdev)) ) { 
-                printk(KERN_ERR __FUNCTION__ ": cannot register %d err %d\n", 
-                       OBD_MINOR, err);
-                return -EIO;
-        }
 
-        for (i = 0; i < MAX_OBD_DEVICES; i++) {
-                memset(&(obd_dev[i]), 0, sizeof(obd_dev[i]));
-                obd_dev[i].obd_minor = i;
-                INIT_LIST_HEAD(&obd_dev[i].obd_gen_clients);
+        if ((err = misc_register(&obd_psdev))) {
+                CERROR("cannot register %d err %d\n", OBD_MINOR, err);
+                return err;
         }
 
-        err = obd_init_obdo_cache();
+        /* This struct is already zerod for us (static global) */
+        for (i = 0, obd = obd_dev; i < MAX_OBD_DEVICES; i++, obd++)
+                obd->obd_minor = i;
+
+        err = obd_init_caches();
+        
         if (err)
                 return err;
         obd_sysctl_init();
-        obd_init_magic = 0x11223344;
+        
+        err=lprocfs_reg_main();
+        
         return 0;
 }
 
-EXPORT_SYMBOL(obd_register_type);
-EXPORT_SYMBOL(obd_unregister_type);
-
-EXPORT_SYMBOL(obd_print_entry);
-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(obdo_cachep);
-
-/* EXPORT_SYMBOL(gen_multi_attach); */
-EXPORT_SYMBOL(gen_multi_setup);
-EXPORT_SYMBOL(gen_multi_cleanup);
-
-
-#ifdef MODULE
-int init_module(void)
-{
-        return init_obd();
-}
-
-void cleanup_module(void)
+static void __exit cleanup_obdclass(void)
 {
-        int i;
+        int i, err;
         ENTRY;
 
         misc_deregister(&obd_psdev);
         for (i = 0; i < MAX_OBD_DEVICES; i++) {
                 struct obd_device *obd = &obd_dev[i];
-                if ( obd->obd_type && 
-                     (obd->obd_flags & OBD_SET_UP) &&
-                     OBT(obd) && OBP(obd, detach) ) {
+                if (obd->obd_type && (obd->obd_flags & OBD_SET_UP) &&
+                    OBT(obd) && OBP(obd, detach)) {
                         /* XXX should this call generic detach otherwise? */
                         OBP(obd, detach)(obd);
-                } 
+                }
         }
 
-        obd_cleanup_obdo_cache();
+        obd_cleanup_caches();
         obd_sysctl_clean();
-        CDEBUG(D_MALLOC, "CLASS mem used %ld\n", obd_memory);
-        obd_init_magic = 0;
+        
+        err = lprocfs_dereg_main();
+
+        CERROR("obd memory leaked: %ld bytes\n", obd_memory);
         EXIT;
 }
-#endif
+
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_DESCRIPTION("Lustre Class Driver v1.0");
+MODULE_LICENSE("GPL");
+
+module_init(init_obdclass);
+module_exit(cleanup_obdclass);