LVM2/daemons/dmeventd/plugins mirror/dmeventd_ ...

LVM2/daemons/dmeventd/plugins mirror/dmeventd_ ...

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2010-01-22 12:48:58

Modified files:
	daemons/dmeventd/plugins/mirror: dmeventd_mirror.c 
	daemons/dmeventd/plugins/snapshot: dmeventd_snapshot.c 

Log message:
	Fix syslog prefix in the first message (dmeventd->lvm).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c.diff?cvsroot=lvm2&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c.diff?cvsroot=lvm2&r1=1.6&r2=1.7

--- LVM2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2010/01/21 22:15:46	1.30
+++ LVM2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2010/01/22 12:48:58	1.31
@@ -225,8 +225,9 @@
 		    int minor __attribute((unused)),
 		    void **unused __attribute((unused)))
 {
+	int r = dmeventd_lvm2_init();
 	syslog(LOG_INFO, "Monitoring mirror device %s for events", device);
-	return dmeventd_lvm2_init();
+	return r;
 }
 
 int unregister_device(const char *device,
--- LVM2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2010/01/22 00:18:37	1.6
+++ LVM2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2010/01/22 12:48:58	1.7
@@ -120,11 +120,12 @@
 		    void **private)
 {
 	int *percent_warning = (int*)private;
+	int r = dmeventd_lvm2_init();
 
 	*percent_warning = WARNING_THRESH; /* Print warning if snapshot is full */
 
 	syslog(LOG_INFO, "Monitoring snapshot %s\n", device);
-	return dmeventd_lvm2_init();
+	return r;
 }
 
 int unregister_device(const char *device,

LVM2/daemons/dmeventd/plugins mirror/dmeventd_ ...

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-05-11 08:32:23

Modified files:
	daemons/dmeventd/plugins/mirror: dmeventd_mirror.c 
	daemons/dmeventd/plugins/snapshot: dmeventd_snapshot.c 

Log message:
	Headerfile <pthread.h> is no longer needed here

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c.diff?cvsroot=lvm2&r1=1.33&r2=1.34
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c.diff?cvsroot=lvm2&r1=1.8&r2=1.9

--- LVM2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2010/03/30 14:39:55	1.33
+++ LVM2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c	2010/05/11 08:32:22	1.34
@@ -19,8 +19,6 @@
 #include "libdevmapper-event.h"
 #include "dmeventd_lvm.h"
 
-#include <pthread.h>
-
 #include <syslog.h> /* FIXME Replace syslog with multilog */
 /* FIXME Missing openlog? */
 /* FIXME Replace most syslogs with log_error() style messages and add complete context. */
--- LVM2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2010/02/15 12:55:20	1.8
+++ LVM2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c	2010/05/11 08:32:22	1.9
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -21,7 +21,6 @@
 
 #include "lvm-string.h"
 
-#include <pthread.h>
 #include <syslog.h> /* FIXME Replace syslog with multilog */
 /* FIXME Missing openlog? */