Remove orphaned snapshots even if disk space is not low.

[dss.git] / ipc.c

diff --git a/ipc.c b/ipc.c
index 14b0259a8d9ad19d8082d992c042b0c3ffd95d4c..65ef20049d26748ef54b6fd60068e7492b159beb 100644 (file)
--- a/ipc.c
+++ b/ipc.c
@@ -15,10 +15,10 @@
 #include <sys/param.h>
 
 #include "gcc-compat.h"
-#include "string.h"
+#include "str.h"
 #include "log.h"
 #include "gcc-compat.h"
-#include "error.h"
+#include "err.h"
 #include "ipc.h"
 
 #if (defined(__GNUC__) && defined(__i386__))
@@ -237,11 +237,11 @@ static inline int get_key_or_die(char *config_file)
        if (stat(config_file, &statbuf) == 0) {
                ret = dss_realpath(config_file, &rpath);
                if (ret < 0) {
-                       DSS_EMERG_LOG("could not resolve path %s: %s\n", config_file,
-                               dss_strerror(-ret));
+                       DSS_EMERG_LOG(("could not resolve path %s: %s\n", config_file,
+                               dss_strerror(-ret)));
                        exit(EXIT_FAILURE);
                }
-               DSS_DEBUG_LOG("resolved path: %s\n", rpath);
+               DSS_DEBUG_LOG(("resolved path: %s\n", rpath));
        } else
                /*
                 * This happens if the user did not specify a config file, and
@@ -261,7 +261,7 @@ static int mutex_get(int key, int flags)
 {
        int ret;
 
-       DSS_DEBUG_LOG("getting semaphore 0x%x\n", key);
+       DSS_DEBUG_LOG(("getting semaphore 0x%x\n", key));
        ret = semget(key, 2, flags);
        if (ret < 0)
                return -ERRNO_TO_DSS_ERROR(errno);
@@ -272,7 +272,7 @@ static int do_semop(int id, struct sembuf *sops, int num)
 {
        int ret;
 
-       DSS_DEBUG_LOG("calling semop\n");
+       DSS_DEBUG_LOG(("calling semop\n"));
        do {
                ret = semop(id, sops, num);
                if (ret >= 0)
@@ -286,7 +286,7 @@ static int mutex_lock(int id)
        struct sembuf sops[4];
        int ret;
 
-       DSS_DEBUG_LOG("locking\n");
+       DSS_DEBUG_LOG(("locking\n"));
 
        sops[0].sem_num = 0;
        sops[0].sem_op = 0;
@@ -315,7 +315,7 @@ static int mutex_try_lock(int id)
        struct sembuf sops[2];
        int ret;
 
-       DSS_DEBUG_LOG("trying to lock\n");
+       DSS_DEBUG_LOG(("trying to lock\n"));
 
        sops[0].sem_num = 0;
        sops[0].sem_op = 0;