Branch HEAD

Don't print "Lustre: " twice.

diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index f2730d0..11f0bef 100644 (file)
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -596,7 +596,7 @@ static int __init obdecho_init(void)
         int rc;
 
         ENTRY;
-        LCONSOLE_INFO("Lustre: Echo OBD driver; http://www.lustre.org/\n");
+        LCONSOLE_INFO("Echo OBD driver; http://www.lustre.org/\n");
 
         LASSERT(CFS_PAGE_SIZE % OBD_ECHO_BLOCK_SIZE == 0);
 

diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c
index 9d2e968..7014221 100644 (file)
--- a/lustre/obdecho/echo_client.c
+++ b/lustre/obdecho/echo_client.c
@@ -57,14 +57,14 @@ echo_printk_object (char *msg, struct ec_object *eco)
         struct lov_stripe_md *lsm = eco->eco_lsm;
         int                   i;
 
-        CDEBUG(D_INFO, "Lustre: %s: object %p: "LPX64", refs %d%s: "LPX64
-                "=%u!%u\n", msg, eco, eco->eco_id, eco->eco_refcount,
-                eco->eco_deleted ? "(deleted) " : "",
-                lsm->lsm_object_id, lsm->lsm_stripe_size,
-                lsm->lsm_stripe_count);
+        CDEBUG(D_INFO, "%s: object %p: "LPX64", refs %d%s: "LPX64"=%u!%u\n",
+               msg, eco, eco->eco_id, eco->eco_refcount,
+               eco->eco_deleted ? "(deleted) " : "",
+               lsm->lsm_object_id, lsm->lsm_stripe_size,
+               lsm->lsm_stripe_count);
 
         for (i = 0; i < lsm->lsm_stripe_count; i++)
-                CDEBUG(D_INFO, "Lustre:   @%2u:"LPX64"\n",
+                CDEBUG(D_INFO, "@%2u:"LPX64"\n",
                        lsm->lsm_oinfo[i].loi_ost_idx,
                        lsm->lsm_oinfo[i].loi_id);
 }