b=16909 Use INFO/WARN instead of WARN/ERROR for the slow messages.

We should use INFO/WARN instead of WARN/ERROR for the slow messages.
Not only is there no real error here but it fixes an annoying quirk
of the message formatting.  With the old levels you would see the
messages formatted differently based on the time.

  Lustre: lc1-OST0001: slow parent lock 289s due to heavy IO load
  LustreError: 0-0: lc1-OST0001: slow parent lock 324s due to heavy IO load

With the new levels things are more consistent.

  Lustre: lc1-OST0001: slow parent lock 289s due to heavy IO load
  Lustre: lc1-OST0001: slow parent lock 324s due to heavy IO load

diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h
index 01abf1e..0fb14df 100644 (file)
--- a/lustre/include/linux/lustre_fsfilt.h
+++ b/lustre/include/linux/lustre_fsfilt.h
@@ -182,19 +182,19 @@ static inline lvfs_sbdev_type fsfilt_journal_sbdev(struct obd_device *obd,
 #define FSFILT_OP_JOIN          11
 #define FSFILT_OP_NOOP          15
 
-#define __fsfilt_check_slow(obd, start, msg)                            \
-do {                                                                    \
-        if (time_before(jiffies, start + 15 * HZ))                      \
-                break;                                                  \
-        else if (time_before(jiffies, start + 30 * HZ))                 \
-                CDEBUG(D_VFSTRACE, "%s: slow %s %lus\n", obd->obd_name, \
-                       msg, (jiffies-start) / HZ);                      \
-        else if (time_before(jiffies, start + DISK_TIMEOUT * HZ))       \
-                CWARN("%s: slow %s %lus\n", obd->obd_name, msg,         \
-                      (jiffies - start) / HZ);                          \
-        else                                                            \
-                CERROR("%s: slow %s %lus\n", obd->obd_name, msg,        \
-                       (jiffies - start) / HZ);                         \
+#define __fsfilt_check_slow(obd, start, msg)                                 \
+do {                                                                         \
+        if (time_before(jiffies, start + 15 * HZ))                           \
+                break;                                                       \
+        else if (time_before(jiffies, start + 30 * HZ))                      \
+                CDEBUG(D_VFSTRACE, "%s: slow %s %lus due to heavy IO load\n",\
+                       obd->obd_name, msg, (jiffies-start) / HZ);            \
+        else if (time_before(jiffies, start + DISK_TIMEOUT * HZ))            \
+                LCONSOLE_INFO("%s: slow %s %lus due to heavy IO load\n",     \
+                              obd->obd_name, msg, (jiffies - start) / HZ);   \
+        else                                                                 \
+                LCONSOLE_WARN("%s: slow %s %lus due to heavy IO load\n",     \
+                              obd->obd_name, msg, (jiffies - start) / HZ);   \
 } while (0)
 
 #define fsfilt_check_slow(obd, start, msg)    \