CVSROOT: /cvs/cluster
Module name: cluster
Changes by: teigland@sourceware.org 2007-11-21 17:49:16

Modified files:
group/gfs_controld: lock_dlm.h

Log message:
ASSERT was doing fprintf(stderr) which goes somewhere we don't want
when running as a daemon.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/lock_dlm.h.diff?cvsroot=cluster&r1=1.29&r2=1.30

--- cluster/group/gfs_controld/lock_dlm.h 2007/09/04 19:22:52 1.29
+++ cluster/group/gfs_controld/lock_dlm.h 2007/11/21 17:49:16 1.30
@@ -105,13 +105,12 @@
} while (0)

#define ASSERT(x)
-{
+do {
if (!(x)) {
- fprintf(stderr, "
Assertion failed on line %d of file %s

"
- "Assertion: "%s"
",
- __LINE__, __FILE__, #x);
- }
-}
+ log_error("Assertion failed on line %d of file %s
"
+ "Assertion: "%s"
", __LINE__, __FILE__, #x);
+ }
+} while (0)

struct mountpoint {
struct list_head list;

CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: teigland@sourceware.org 2007-11-21 17:50:16

Modified files:
group/gfs_controld: lock_dlm.h

Log message:
ASSERT was doing fprintf(stderr) which goes somewhere we don't want
when running as a daemon.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/lock_dlm.h.diff?cvsroot=cluster&only_with_tag=RHEL 5&r1=1.21.2.8&r2=1.21.2.9

--- cluster/group/gfs_controld/lock_dlm.h 2007/09/04 19:27:34 1.21.2.8
+++ cluster/group/gfs_controld/lock_dlm.h 2007/11/21 17:50:15 1.21.2.9
@@ -105,13 +105,12 @@
} while (0)

#define ASSERT(x)
-{
+do {
if (!(x)) {
- fprintf(stderr, "
Assertion failed on line %d of file %s

"
- "Assertion: "%s"
",
- __LINE__, __FILE__, #x);
- }
-}
+ log_error("Assertion failed on line %d of file %s
"
+ "Assertion: "%s"
", __LINE__, __FILE__, #x);
+ }
+} while (0)

struct mountpoint {
struct list_head list;

On Wed, Nov 21, 2007 at 05:50:16PM -0000, teigland@sourceware.org wrote:
> CVSROOT: /cvs/cluster
> Module name: cluster
> Branch: RHEL5
> Changes by: teigland@sourceware.org 2007-11-21 17:50:16
>
> Modified files:
> group/gfs_controld: lock_dlm.h
>
> Log message:
> ASSERT was doing fprintf(stderr) which goes somewhere we don't want
> when running as a daemon.

created bz 394721 for this