Branch HEAD

b=14751
i=green
i=bzzz

reset the time reference between calls to fsfilt_check_slow to prevent
useless slow brw_start/direct_io/... messages.

diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h
index a091f45..93c47ee 100644 (file)
--- a/lustre/include/linux/lustre_fsfilt.h
+++ b/lustre/include/linux/lustre_fsfilt.h
@@ -164,7 +164,7 @@ 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, timeout, msg)                     \
+#define __fsfilt_check_slow(obd, start, timeout, msg)                     \
 do {                                                                    \
         if (time_before(jiffies, start + 15 * HZ))                      \
                 break;                                                  \
@@ -179,6 +179,12 @@ do {                                                                    \
                        (jiffies - start) / HZ);                         \
 } while (0)
 
+#define fsfilt_check_slow(obd, start, timeout, msg)    \
+do {                                                   \
+        __fsfilt_check_slow(obd, start, timeout, msg); \
+        start = jiffies;                               \
+} while (0)
+
 static inline void *fsfilt_start_log(struct obd_device *obd,
                                      struct inode *inode, int op,
                                      struct obd_trans_info *oti, int logs)