smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

[fs/lustre-release.git] / lustre / cobd / cache_obd.c

diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c
index c42dab1..0a27122 100644 (file)
--- a/lustre/cobd/cache_obd.c
+++ b/lustre/cobd/cache_obd.c
@@ -30,19 +30,33 @@
 #include <linux/obd_class.h>
 #include <linux/obd_cache.h>
 
-static int cobd_setup (struct obd_device *obd, obd_count len, void *buf)
+static int cobd_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+
+        lprocfs_init_vars(cobd, &lvars);
+        return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
+
+static int cobd_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
+static int
+cobd_setup (struct obd_device *dev, obd_count len, void *buf)
 {
         struct lustre_cfg *lcfg = (struct lustre_cfg *)buf;
-        struct cache_obd  *cobd = &obd->u.cobd;
+        struct cache_obd  *cobd = &dev->u.cobd;
         struct obd_device *target;
         struct obd_device *cache;
         struct obd_uuid target_uuid;
         struct obd_uuid cache_uuid;
         struct lustre_handle target_conn = {0,}, cache_conn = {0,};
-        struct lprocfs_static_vars lvars;
         int                rc;
 
-        if (lcfg->lcfg_inlbuf1 == NULL || lcfg->lcfg_inlbuf2 == NULL)
+        if (lcfg->lcfg_inlbuf1 == NULL ||
+            lcfg->lcfg_inlbuf2 == NULL)
                 return (-EINVAL);
 
         obd_str2uuid(&target_uuid, lcfg->lcfg_inlbuf1);
@@ -68,29 +82,24 @@ static int cobd_setup (struct obd_device *obd, obd_count len, void *buf)
         }
         cobd->cobd_cache_exp = class_conn2export(&cache_conn);
 
-        lprocfs_init_vars(cobd, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
-        return 0;
+        return rc;
 }
 
-static int cobd_cleanup(struct obd_device *obd, int flags)
+static int cobd_cleanup(struct obd_device *dev, int flags)
 {
-        struct cache_obd  *cobd = &obd->u.cobd;
+        struct cache_obd  *cobd = &dev->u.cobd;
         int                rc;
 
-        if (!list_empty(&obd->obd_exports))
+        if (!list_empty(&dev->obd_exports))
                 return (-EBUSY);
 
-        lprocfs_obd_cleanup(obd);
-
         rc = obd_disconnect(cobd->cobd_cache_exp, flags);
         if (rc != 0)
-                CERROR("error %d disconnecting cache\n", rc);
+                CERROR ("error %d disconnecting cache\n", rc);
 
         rc = obd_disconnect(cobd->cobd_target_exp, flags);
         if (rc != 0)
-                CERROR("error %d disconnecting target\n", rc);
+                CERROR ("error %d disconnecting target\n", rc);
 
         return (0);
 }
@@ -234,22 +243,24 @@ static int cobd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 }
 
 static struct obd_ops cobd_ops = {
-        .o_owner                = THIS_MODULE,
+        o_owner:                THIS_MODULE,
+        o_attach:               cobd_attach,
+        o_detach:               cobd_detach,
 
-        .o_setup                = cobd_setup,
-        .o_cleanup              = cobd_cleanup,
+        o_setup:                cobd_setup,
+        o_cleanup:              cobd_cleanup,
 
-        .o_connect              = cobd_connect,
-        .o_disconnect           = cobd_disconnect,
+        o_connect:              cobd_connect,
+        o_disconnect:           cobd_disconnect,
 
-        .o_get_info             = cobd_get_info,
-        .o_statfs               = cobd_statfs,
+        o_get_info:             cobd_get_info,
+        o_statfs:               cobd_statfs,
 
-        .o_getattr              = cobd_getattr,
-        .o_preprw               = cobd_preprw,
-        .o_commitrw             = cobd_commitrw,
-        .o_brw                  = cobd_brw,
-        .o_iocontrol            = cobd_iocontrol,
+        o_getattr:              cobd_getattr,
+        o_preprw:               cobd_preprw,
+        o_commitrw:             cobd_commitrw,
+        o_brw:                  cobd_brw,
+        o_iocontrol:            cobd_iocontrol,
 };
 
 static int __init cobd_init(void)
@@ -260,7 +271,7 @@ static int __init cobd_init(void)
         printk(KERN_INFO "Lustre: Caching OBD driver; info@clusterfs.com\n");
 
         lprocfs_init_vars(cobd, &lvars);
-        RETURN(class_register_type(&cobd_ops, lvars.module_vars,
+        RETURN(class_register_type(&cobd_ops, NULL, lvars.module_vars,
                                    OBD_CACHE_DEVICENAME));
 }