LU-459 debug: quiet overly verbose debug messages

Some debugging messages are being printed to the console, but
do not provide any particular value.  Turn these into kernel
debug messages.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Id8b0624b281ce67501d0d81cd0e89cc020cd669a
Reviewed-on: http://review.whamcloud.com/1876
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Niu Yawei <niu@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index c8e4131..1ba3a12 100644 (file)
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -115,13 +115,11 @@ static int __init init_lustre_lite(void)
         struct timeval tv;
         lnet_process_id_t lnet_id;
 
-#ifndef CRAY_XT3
         /* print an address of _any_ initialized kernel symbol from this
          * module, to allow debugging with gdb that doesn't support data
          * symbols from modules.*/
-        CDEBUG(D_CONSOLE, "Lustre client module (%p).\n",
+        CDEBUG(D_INFO, "Lustre client module (%p).\n",
                &lustre_super_operations);
-#endif
 
         rc = ll_init_inodecache();
         if (rc)

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index ed9f2b0..88b7a74 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -3047,7 +3047,7 @@ int __init lov_init(void)
         /* print an address of _any_ initialized kernel symbol from this
          * module, to allow debugging with gdb that doesn't support data
          * symbols from modules.*/
-        CDEBUG(D_CONSOLE, "Lustre LOV module (%p).\n", &lov_caches);
+        CDEBUG(D_INFO, "Lustre LOV module (%p).\n", &lov_caches);
 
         rc = lu_kmem_init(lov_caches);
         if (rc)

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index e8b1d38..d9f0542 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -261,7 +261,7 @@ static int mgs_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 
         ping_evictor_start();
 
-        LCONSOLE_INFO("MGS %s started\n", obd->obd_name);
+        CDEBUG(D_INFO, "MGS %s started\n", obd->obd_name);
 
         RETURN(0);
 

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index eae47c2..5429b14 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -4656,7 +4656,7 @@ int __init osc_init(void)
         /* print an address of _any_ initialized kernel symbol from this
          * module, to allow debugging with gdb that doesn't support data
          * symbols from modules.*/
-        CDEBUG(D_CONSOLE, "Lustre OSC module (%p).\n", &osc_caches);
+        CDEBUG(D_INFO, "Lustre OSC module (%p).\n", &osc_caches);
 
         rc = lu_kmem_init(osc_caches);
 

diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c
index 3487211..360c745 100644 (file)
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -1467,7 +1467,8 @@ int sptlrpc_import_sec_adapt(struct obd_import *imp,
                         sptlrpc_import_sec_adapt_inplace(imp, sec, &sf);
                         GOTO(out, rc);
                 }
-        } else if (sptlrpc_flavor2name_base(sf.sf_rpc) != SPTLRPC_FLVR_NULL) {
+        } else if (SPTLRPC_FLVR_BASE(sf.sf_rpc) !=
+                   SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_NULL)) {
                 LCONSOLE_INFO("import %s->%s netid %x: select flavor %s\n",
                               imp->imp_obd->obd_name,
                               obd_uuid2str(&conn->c_remote_uuid),