obdfs/flushd.c: removed iput() from dequeue routine, as we no longer remove

[fs/lustre-release.git] / lustre / obdclass / genops.c

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index c6e7dfd..0564a79 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -62,10 +62,13 @@ void obd_cleanup_obdo_cache(void)
        if (obdo_cachep != NULL) {
                CDEBUG(D_INODE, "destroying obdo_cache at %p\n", obdo_cachep);
                if (kmem_cache_destroy(obdo_cachep))
-                       printk(KERN_INFO "obd_cleanup_obdo_cache: unable to free all of cache\n");
+                       printk(KERN_WARNING __FUNCTION__
+                              ": unable to free cache\n");
        } else
-               printk(KERN_INFO "obd_cleanup_obdo_cache: called with NULL cache pointer\n");
+               printk(KERN_INFO __FUNCTION__
+                      ": called with NULL cache pointer\n");
 
+       obdo_cachep = NULL;
        EXIT;
 }
 
@@ -96,7 +99,7 @@ int gen_connect (struct obd_conn *conn)
 
        OBD_ALLOC(cli, struct obd_client *, sizeof(struct obd_client));
        if ( !cli ) {
-               printk("obd_connect (minor %d): no memory!\n", 
+               printk(__FUNCTION__ ": no memory! (minor %d)\n", 
                       conn->oc_dev->obd_minor);
                return -ENOMEM;
        }
@@ -194,7 +197,9 @@ int gen_multi_cleanup(struct obd_device *obddev)
                rc  = OBP(ch_conn->oc_dev, disconnect)(ch_conn);
 
                if ( rc != 0 ) {
-                       printk("OBD multi cleanup dev: disconnect failure %d\n", ch_conn->oc_dev->obd_minor);
+                       printk(KERN_WARNING __FUNCTION__
+                              ": disconnect failure %d\n",
+                              ch_conn->oc_dev->obd_minor);
                }
        }               
        return 0;