[dm-devel] device-mapper dmeventd/dmeventd.c lib/libdm-st ...
agk at sourceware.org
agk at sourceware.org
Mon Jan 8 15:35:08 UTC 2007
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk at sourceware.org 2007-01-08 15:35:08
Modified files:
dmeventd : dmeventd.c
lib : libdm-string.c
Log message:
fix last checkin
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmeventd/dmeventd.c.diff?cvsroot=dm&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/lib/libdm-string.c.diff?cvsroot=dm&r1=1.3&r2=1.4
--- device-mapper/dmeventd/dmeventd.c 2007/01/08 15:18:52 1.26
+++ device-mapper/dmeventd/dmeventd.c 2007/01/08 15:35:08 1.27
@@ -40,6 +40,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
+
+#include <sys/resource.h>
#include <unistd.h>
#include <stdarg.h>
#include <arpa/inet.h> /* for htonl, ntohl */
@@ -1453,7 +1455,7 @@
init_fifos(&fifos);
- pthread_mutex_init(&mutex, NULL);
+ pthread_mutex_init(&_global_mutex, NULL);
#ifdef MCL_CURRENT
if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1)
@@ -1481,7 +1483,7 @@
#ifdef MCL_CURRENT
munlockall();
#endif
- pthread_mutex_destroy(&_mutex);
+ pthread_mutex_destroy(&_global_mutex);
syslog(LOG_INFO, "dmeventd shutting down.");
closelog();
--- device-mapper/lib/libdm-string.c 2007/01/08 15:18:52 1.3
+++ device-mapper/lib/libdm-string.c 2007/01/08 15:35:08 1.4
@@ -126,6 +126,6 @@
{
char *p = strrchr(path, '/');
- return p ? p + 1 : path;
+ return p ? p + 1 : (char *) path;
}
More information about the dm-devel
mailing list