class/*.c: changed debugging messages

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 8a1204d..b826c14 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -58,8 +58,8 @@
 #include <linux/obd_class.h>
 
 static int obd_init_magic;
-int           obd_print_entry = 1;
-int           obd_debug_level = 0;
+int obd_print_entry = 0;
+int obd_debug_level = D_IOCTL|D_INODE|D_SUPER|D_WARNING;
 struct obd_device obd_dev[MAX_OBD_DEVICES];
 struct list_head obd_types;
 
@@ -113,12 +113,12 @@ static struct obd_type *obd_nm_to_type(char *nm)
 {
        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;
@@ -135,7 +135,7 @@ static int getdata(int len, void **data)
        if (!len) 
                return 0;
 
-       CDEBUG(D_IOCTL, "getdata: len %d, add %p\n", len, *data);
+       CDEBUG(D_INFO, "getdata: len %d, add %p\n", len, *data);
 
        OBD_ALLOC(tmp, void *, len);
        if ( !tmp )
@@ -163,8 +163,10 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
        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)
@@ -210,10 +212,10 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
 #ifdef CONFIG_KMOD
                if ( !type ) {
                        if ( !request_module(nm) ) {
-                               CDEBUG(D_IOCTL, "Loaded module '%s'\n", nm);
+                               CDEBUG(D_PSDEV, "Loaded module '%s'\n", nm);
                                type = obd_nm_to_type(nm);
                        } else {
-                               CDEBUG(D_IOCTL, "Can't load module '%s'\n", nm);
+                               CDEBUG(D_PSDEV, "Can't load module '%s'\n", nm);
                        }
                }
 #endif
@@ -237,13 +239,13 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                INIT_LIST_HEAD(&obddev->obd_gen_clients);
                obddev->obd_multi_count = 0;
 
-               CDEBUG(D_IOCTL, "Attach %d, datalen %d, type %s\n", 
+               CDEBUG(D_INFO, "Attach %d, datalen %d, type %s\n", 
                       dev, input->att_datalen, obddev->obd_type->typ_name);
                /* maybe we are done */
                if ( !OBT(obddev) || !OBP(obddev, attach) ) {
                        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;
@@ -262,7 +264,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                } 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;
@@ -288,11 +290,11 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                        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;
@@ -337,11 +339,11 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                }
 
                /* 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);
                        obddev->obd_flags |= OBD_SET_UP;
                        EXIT;
@@ -356,7 +358,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                        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;
@@ -399,7 +401,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
        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;
@@ -583,7 +585,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                                        &rw_s->count, rw_s->offset);
                
                ODEBUG(&rw_s->obdo);
-               CDEBUG(D_INODE, "READ: conn %d, count %Ld, offset %Ld, '%s'\n",
+               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;
@@ -611,7 +613,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                        return err;
                }
 
-               CDEBUG(D_INODE, "WRITE: conn %d, count %Ld, offset %Ld, '%s'\n",
+               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);
@@ -704,7 +706,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                        return -EOPNOTSUPP;
 
                /* do the partition */
-               CDEBUG(D_IOCTL, "Copy %d, type %s dst %Ld src %Ld\n", dev, 
+               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);
 
@@ -731,13 +733,13 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                        return err;
                }
 
-               CDEBUG(D_IOCTL, "Migrate copying %d bytes\n", sizeof(*mvdata));
+               CDEBUG(D_INFO, "Migrate copying %d bytes\n", sizeof(*mvdata));
 
                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",
+               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);
 
@@ -773,10 +775,10 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
 #ifdef CONFIG_KMOD
                if ( !type ) {
                        if ( !request_module(nm) ) {
-                               CDEBUG(D_IOCTL, "Loaded module '%s'\n", nm);
+                               CDEBUG(D_PSDEV, "Loaded module '%s'\n", nm);
                                type = obd_nm_to_type(nm);
                        } else {
-                               CDEBUG(D_IOCTL, "Can't load module '%s'\n", nm);
+                               CDEBUG(D_PSDEV, "Can't load module '%s'\n", nm);
                        }
                }
 #endif
@@ -793,7 +795,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                }
                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 */
@@ -822,6 +824,7 @@ int obd_register_type(struct obd_ops *ops, char *nm)
 
 
        if (obd_init_magic != 0x11223344) {
+               printk(__FUNCTION__ ": bad magic for type\n");
                EXIT;
                return -EINVAL;
        }

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 0564a79..c4f1533 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -38,7 +38,7 @@ int obd_init_obdo_cache(void)
 {
        ENTRY;
        if (obdo_cachep == NULL) {
-               CDEBUG(D_INODE, "allocating obdo_cache\n");
+               CDEBUG(D_CACHE, "allocating obdo_cache\n");
                obdo_cachep = kmem_cache_create("obdo_cache",
                                                sizeof(struct obdo),
                                                0, SLAB_HWCACHE_ALIGN,
@@ -47,10 +47,10 @@ int obd_init_obdo_cache(void)
                        EXIT;
                        return -ENOMEM;
                } else {
-                       CDEBUG(D_INODE, "allocated cache at %p\n", obdo_cachep);
+                       CDEBUG(D_CACHE, "allocated cache at %p\n", obdo_cachep);
                }
        } else {
-               CDEBUG(D_INODE, "using existing cache at %p\n", obdo_cachep);
+               CDEBUG(D_CACHE, "using existing cache at %p\n", obdo_cachep);
        }
        EXIT;
        return 0;
@@ -60,7 +60,7 @@ void obd_cleanup_obdo_cache(void)
 {
        ENTRY;
        if (obdo_cachep != NULL) {
-               CDEBUG(D_INODE, "destroying obdo_cache at %p\n", obdo_cachep);
+               CDEBUG(D_CACHE, "destroying obdo_cache at %p\n", obdo_cachep);
                if (kmem_cache_destroy(obdo_cachep))
                        printk(KERN_WARNING __FUNCTION__
                               ": unable to free cache\n");
@@ -111,7 +111,7 @@ int gen_connect (struct obd_conn *conn)
        cli->cli_obd = conn->oc_dev;
        list_add(&(cli->cli_chain), conn->oc_dev->obd_gen_clients.prev);
 
-       CDEBUG(D_IOCTL, "connect: new ID %u\n", cli->cli_id);
+       CDEBUG(D_INFO, "connect: new ID %u\n", cli->cli_id);
        conn->oc_id = cli->cli_id;
        return 0;
 } /* gen_obd_connect */
@@ -132,7 +132,7 @@ int gen_disconnect(struct obd_conn *conn)
        list_del(&(cli->cli_chain));
        OBD_FREE(cli, sizeof(struct obd_client));
 
-       CDEBUG(D_IOCTL, "disconnect: ID %u\n", conn->oc_id);
+       CDEBUG(D_INFO, "disconnect: ID %u\n", conn->oc_id);
 
        EXIT;
        return 0;
@@ -154,7 +154,12 @@ int gen_multi_setup(struct obd_device *obddev, uint32_t len, void *data)
                rc  = OBP(ch_conn->oc_dev, connect)(ch_conn);
 
                if ( rc != 0 ) {
-                       /* XXX disconnect others */
+                       int j;
+
+                       for (j = --i; j >= 0; --j) {
+                               ch_conn = &obddev->obd_multi_conn[i];
+                               OBP(ch_conn->oc_dev, disconnect)(ch_conn);
+                       }
                        return -EINVAL;
                }
        }               
@@ -174,7 +179,7 @@ int gen_multi_attach(struct obd_device *obddev, int len, void *data)
        for (i=0 ; i<count ; i++) {
                rdev = &obd_dev[*((int *)data + i)];
                rdev = rdev + 1;
-               CDEBUG(D_IOCTL, "OBD RAID1: replicator %d is of type %s\n", i,
+               CDEBUG(D_INFO, "OBD RAID1: replicator %d is of type %s\n", i,
                       (rdev + i)->obd_type->typ_name);
        }
        return 0;
@@ -221,7 +226,7 @@ int gen_cleanup(struct obd_device * obddev)
        lh = tmp = &obddev->obd_gen_clients;
        while ((tmp = tmp->next) != lh) {
                cli = list_entry(tmp, struct obd_client, cli_chain);
-               CDEBUG(D_IOCTL, "Disconnecting obd_connection %d, at %p\n",
+               CDEBUG(D_INFO, "Disconnecting obd_connection %d, at %p\n",
                       cli->cli_id, cli);
        }
        return 0;
@@ -259,7 +264,7 @@ int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst,
        int err = 0;
 
        ENTRY;
-       CDEBUG(D_INODE, "src: ino %Ld blocks %Ld, size %Ld, dst: ino %Ld\n", 
+       CDEBUG(D_INFO, "src: ino %Ld blocks %Ld, size %Ld, dst: ino %Ld\n", 
               src->o_id, src->o_blocks, src->o_size, dst->o_id);
        page = alloc_page(GFP_USER);
        if ( !page ) {
@@ -292,7 +297,7 @@ int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst,
                        EXIT;
                        break;
                }
-               CDEBUG(D_INODE, "Read page %ld ...\n", page->index);
+               CDEBUG(D_INFO, "Read page %ld ...\n", page->index);
 
                err = OBP(dst_conn->oc_dev, brw)(WRITE, dst_conn, num_oa, &dst,
                                                 &num_buf, &buf, &brw_count,
@@ -304,7 +309,7 @@ int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst,
                        break;
                }
 
-               CDEBUG(D_INODE, "Wrote page %ld ...\n", page->index);
+               CDEBUG(D_INFO, "Wrote page %ld ...\n", page->index);
                
                index++;
        }