- cleanups in cobd and cmobd

- moved cmobd's level in lconf to be under mountpoint. This prevents oops in local config when both cobd and cmobd are used and refer to the same master device.

diff --git a/lustre/cmobd/cm_obd.c b/lustre/cmobd/cm_obd.c
index 3492fe1..15bbb36 100644 (file)
--- a/lustre/cmobd/cm_obd.c
+++ b/lustre/cmobd/cm_obd.c
@@ -294,12 +294,12 @@ static int cmobd_iocontrol(unsigned int cmd, struct obd_export *exp,
 }
 
 static struct obd_ops cmobd_ops = {
-        o_owner:                THIS_MODULE,
-        o_attach:               cmobd_attach,
-        o_detach:               cmobd_detach,
-        o_setup:                cmobd_setup,
-        o_cleanup:              cmobd_cleanup,
-        o_iocontrol:            cmobd_iocontrol,
+        .o_owner     = THIS_MODULE,
+        .o_attach    = cmobd_attach,
+        .o_detach    = cmobd_detach,
+        .o_setup     = cmobd_setup,
+        .o_cleanup   = cmobd_cleanup,
+        .o_iocontrol = cmobd_iocontrol,
 };
 
 kmem_cache_t *cmobd_extent_slab;

diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c
index 17d4d28..9cbcd9f 100644 (file)
--- a/lustre/cobd/cache_obd.c
+++ b/lustre/cobd/cache_obd.c
@@ -50,14 +50,15 @@ static int cobd_detach(struct obd_device *obd)
 static int cobd_setup(struct obd_device *obd, obd_count len, void *buf)
 {
         struct lustre_cfg *lcfg = (struct lustre_cfg *)buf;
-        struct cache_obd  *cobd = &obd->u.cobd;
+        int inst_len = 0, mname_len = 0, cname_len = 0;
         struct obd_device *master_obd, *cache_obd;
+        struct cache_obd  *cobd = &obd->u.cobd;
         struct lustre_handle conn = { 0 };
-        int    inst_len = 0, mname_len = 0, cname_len = 0;
-        
         int rc = 0;
         ENTRY;
 
+        sema_init(&cobd->sem, 1);
+        
         if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1 ||
             lustre_cfg_buf(lcfg, 1) == NULL) {
                 CERROR("%s: setup requires master device name\n", 
@@ -82,7 +83,7 @@ static int cobd_setup(struct obd_device *obd, obd_count len, void *buf)
                 cname_len = LUSTRE_CFG_BUFLEN(lcfg, 2);
         } 
        
-        /*get the cache obd name and master name */
+        /* get the cache obd name and master name */
         OBD_ALLOC(cobd->master_name, mname_len);
         if (!cobd->master_name) 
                 RETURN(-ENOMEM);
@@ -91,7 +92,6 @@ static int cobd_setup(struct obd_device *obd, obd_count len, void *buf)
                         lustre_cfg_string(lcfg, 3));
         else 
                 sprintf(cobd->master_name, "%s", lustre_cfg_string(lcfg, 1));
-
         
         OBD_ALLOC(cobd->cache_name, cname_len);
         if (!cobd->cache_name) {
@@ -122,6 +122,7 @@ static int cobd_setup(struct obd_device *obd, obd_count len, void *buf)
                GOTO(put_names, rc);
         
         cobd->master_exp = class_conn2export(&conn);
+
         /* getting cache obd */
         cache_obd = class_name2obd(cobd->cache_name);
         if (!cache_obd) {
@@ -139,8 +140,7 @@ static int cobd_setup(struct obd_device *obd, obd_count len, void *buf)
                 GOTO(put_names, rc);
         }
         cobd->cache_exp = class_conn2export(&conn);
-       
-        sema_init(&cobd->sem, 1);
+        
         /* default set cache on */
         cobd->cache_on = 1;
         EXIT;
@@ -154,9 +154,8 @@ put_names:
                         OBD_FREE(cobd->cache_name, LUSTRE_CFG_BUFLEN(lcfg, 2));
                         cobd->cache_name = NULL;
                 }
-        
         }
-        RETURN(rc);
+        return rc;
 }
 
 static int cobd_cleanup(struct obd_device *obd, int flags)

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 07f3790..0243ae4 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -2910,12 +2910,12 @@ def getServiceLevel(self):
         ret = 30
     elif type in ('mdsdev',):
         ret = 40
-    elif type in ('lmv', 'cobd',):
+    elif type in ('lmv',):
         ret = 45
+    elif type in ('cmobd', 'cobd',):
+        ret = 60 
     elif type in ('mountpoint', 'echoclient'):
-        ret = 60
-    elif type in ('cmobd',):
-        ret = 70 
+        ret = 70
     else:
         panic("Unknown type: ", type)
 
@@ -2930,8 +2930,8 @@ def getServices(self):
     list = []
     for ref_class, ref_uuid in self.get_all_refs():
             servdb = self.lookup(ref_uuid)
-            if  servdb:
-                level = getServiceLevel(servdb)
+            if servdb:
+               level = getServiceLevel(servdb)
                 if level > 0:
                     list.append((level, servdb))
             else: