b=16799

i=Adilger
cleanup_obdclass() fix; check_mem_leak t-f fn

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 446a477..d8a0ebb 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -638,10 +638,11 @@ static void cleanup_obdclass(void)
         cfs_mem_cache_destroy(obd_lvfs_ctxt_cache);
 
         lprocfs_free_stats(&obd_memory);
-        CDEBUG((memory_leaked | pages_leaked) ? D_ERROR : D_INFO,
-               "obd_memory max: "LPU64", leaked: "LPU64" "
+        CDEBUG((memory_leaked) ? D_ERROR : D_INFO,
+               "obd_memory max: "LPU64", leaked: "LPU64"\n",
+               memory_max, memory_leaked);
+        CDEBUG((pages_leaked) ? D_ERROR : D_INFO,
                "obd_memory_pages max: "LPU64", leaked: "LPU64"\n",
-               memory_max, memory_leaked,
                pages_max, pages_leaked);
 
         EXIT;