b=17275 make lustre client less verbose at startup time for Cray

i=johann

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index fa4e8e7..7413fc7 100644 (file)
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -112,8 +112,10 @@ static int __init init_lustre_lite(void)
         struct timeval tv;
         lnet_process_id_t lnet_id;
 
+#ifndef CRAY_XT3
         printk(KERN_INFO "Lustre: Lustre Client File System; "
                "http://www.lustre.org/\n");
+#endif
         rc = ll_init_inodecache();
         if (rc)
                 return -ENOMEM;

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 3850a79..8b2d848 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -311,7 +311,7 @@ static int lov_connect_obd(struct obd_device *obd, __u32 index, int activate,
         }
 
         if (imp->imp_invalid) {
-                CERROR("not connecting OSC %s; administratively "
+                CDEBUG(D_CONFIG, "not connecting OSC %s; administratively "
                        "disabled\n", obd_uuid2str(&tgt_uuid));
                 RETURN(0);
         }

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 147b3fa..9601d2c 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -517,9 +517,13 @@ int init_obdclass(void)
         int lustre_register_fs(void);
 #endif
 
+#ifdef CRAY_XT3
+        printk(KERN_INFO "Lustre: Build Version: "BUILD_VERSION"\n");
+#else
         LCONSOLE_INFO("OBD class driver, http://www.lustre.org/\n");
         LCONSOLE_INFO("    Lustre Version: "LUSTRE_VERSION_STRING"\n");
         LCONSOLE_INFO("    Build Version: "BUILD_VERSION"\n");
+#endif
 
         spin_lock_init(&obd_types_lock);
         cfs_waitq_init(&obd_race_waitq);

diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index e756e5f..a3af94d 100644 (file)
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -1011,7 +1011,7 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
                                (char *)lustre_cfg_string(lcfg, 0), key);
                         /* rc = -EINVAL;        continue parsing other params */
                 } else {
-                        LCONSOLE_INFO("%s.%.*s: set parameter %.*s=%s\n",
+                        CDEBUG(D_CONFIG, "%s.%.*s: set parameter %.*s=%s\n",
                                       lustre_cfg_string(lcfg, 0),
                                       (int)strlen(prefix) - 1, prefix,
                                       (int)(sval - key - 1), key, sval);