b=4930

Fix up accidental commit, which had an old version of the patch and no
ChangeLog entry.  This one should be correct.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a59b027..c898563 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -25,7 +25,8 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        - don't interrupt __l_wait_event() during strace
        * miscellania
        - add software watchdogs to catch hung threads quickly (4941)
-       - make lustrefs init script start after nfs is mounted 
+       - make lustrefs init script start after nfs is mounted
+       - fix CWARN/ERROR duplication (4930)
 
 2004-10-07  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.2.7

diff --git a/lustre/portals/include/linux/libcfs.h b/lustre/portals/include/linux/libcfs.h
index cda9739..17f78b7 100644 (file)
--- a/lustre/portals/include/linux/libcfs.h
+++ b/lustre/portals/include/linux/libcfs.h
@@ -194,6 +194,9 @@ do {                                                                          \
                                                                               \
         CHECK_STACK(CDEBUG_STACK);                                            \
         if (time_after(jiffies, cdebug_next)) {                               \
+                portals_debug_msg(DEBUG_SUBSYSTEM, cdebug_mask, __FILE__,     \
+                                  __FUNCTION__, __LINE__, CDEBUG_STACK,       \
+                                  cdebug_format, ## a);                       \
                 if (cdebug_count) {                                           \
                         portals_debug_msg(DEBUG_SUBSYSTEM, cdebug_mask,       \
                                           __FILE__, __FUNCTION__, __LINE__,   \
@@ -201,9 +204,6 @@ do {                                                                          \
                                           cdebug_count);                      \
                         cdebug_count = 0;                                     \
                 }                                                             \
-                portals_debug_msg(DEBUG_SUBSYSTEM, cdebug_mask, __FILE__,     \
-                                  __FUNCTION__, __LINE__, CDEBUG_STACK,       \
-                                  cdebug_format, ## a);                       \
                 if (time_after(jiffies, cdebug_next+(CDEBUG_MAX_LIMIT+10)*HZ))\
                         cdebug_delay = cdebug_delay > 8 ? cdebug_delay/8 : 1; \
                 else                                                          \