libdm: add 'cookie create/inc/dec' log prefix if GETVAL fails for udev sync ops

The same message is printed while performing create/inc/dec operation and
the GETVAL semctl fails. Add a prefix so we know exactly in which of
these functions the issue actually happened.

diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c
index e4b82b23118e6892717c3420435a17afee8305b0..eb722c686fa7b64ecb77dfb3aef13b658297704d 100644 (file)
--- a/device_mapper/libdm-common.c
+++ b/device_mapper/libdm-common.c
@@ -2437,16 +2437,16 @@ static int _udev_notify_sem_inc(uint32_t cookie, int semid)
        int val;
 
        if (semop(semid, &sb, 1) < 0) {
-               log_error("semid %d: semop failed for cookie 0x%" PRIx32 ": %s",
+               log_error("cookie inc: semid %d: semop failed for cookie 0x%" PRIx32 ": %s",
                          semid, cookie, strerror(errno));
                return 0;
        }
 
        if ((val = semctl(semid, 0, GETVAL)) < 0) {
-               log_error("semid %d: sem_ctl GETVAL failed for "
+               log_error("cookie inc: semid %d: sem_ctl GETVAL failed for "
                          "cookie 0x%" PRIx32 ": %s",
                          semid, cookie, strerror(errno));
-               return 0;               
+               return 0;
        }
 
        log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) incremented to %d",
@@ -2461,7 +2461,7 @@ static int _udev_notify_sem_dec(uint32_t cookie, int semid)
        int val;
 
        if ((val = semctl(semid, 0, GETVAL)) < 0) {
-               log_error("semid %d: sem_ctl GETVAL failed for "
+               log_error("cookie dec: semid %d: sem_ctl GETVAL failed for "
                          "cookie 0x%" PRIx32 ": %s",
                          semid, cookie, strerror(errno));
                return 0;
@@ -2470,13 +2470,13 @@ static int _udev_notify_sem_dec(uint32_t cookie, int semid)
        if (semop(semid, &sb, 1) < 0) {
                switch (errno) {
                        case EAGAIN:
-                               log_error("semid %d: semop failed for cookie "
+                               log_error("cookie dec: semid %d: semop failed for cookie "
                                          "0x%" PRIx32 ": "
                                          "incorrect semaphore state",
                                          semid, cookie);
                                break;
                        default:
-                               log_error("semid %d: semop failed for cookie "
+                               log_error("cookie dec: semid %d: semop failed for cookie "
                                          "0x%" PRIx32 ": %s",
                                          semid, cookie, strerror(errno));
                                break;
@@ -2563,7 +2563,7 @@ static int _udev_notify_sem_create(uint32_t *cookie, int *semid)
        sem_arg.val = 1;
 
        if (semctl(gen_semid, 0, SETVAL, sem_arg) < 0) {
-               log_error("semid %d: semctl failed: %s", gen_semid, strerror(errno));
+               log_error("cookie create: semid %d: semctl failed: %s", gen_semid, strerror(errno));
                /* We have to destroy just created semaphore
                 * so it won't stay in the system. */
                (void) _udev_notify_sem_destroy(gen_cookie, gen_semid);
@@ -2571,7 +2571,7 @@ static int _udev_notify_sem_create(uint32_t *cookie, int *semid)
        }
 
        if ((val = semctl(gen_semid, 0, GETVAL)) < 0) {
-               log_error("semid %d: sem_ctl GETVAL failed for "
+               log_error("cookie create: semid %d: sem_ctl GETVAL failed for "
                          "cookie 0x%" PRIx32 ": %s",
                          gen_semid, gen_cookie, strerror(errno));
                goto bad;

diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 15ce2aca7e1f128997d5b949e5a48252e4579796..445b79c179fd30a45f33dc493ecaf432e07d25f8 100644 (file)
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -2436,16 +2436,16 @@ static int _udev_notify_sem_inc(uint32_t cookie, int semid)
        int val;
 
        if (semop(semid, &sb, 1) < 0) {
-               log_error("semid %d: semop failed for cookie 0x%" PRIx32 ": %s",
+               log_error("cookie inc: semid %d: semop failed for cookie 0x%" PRIx32 ": %s",
                          semid, cookie, strerror(errno));
                return 0;
        }
 
        if ((val = semctl(semid, 0, GETVAL)) < 0) {
-               log_error("semid %d: sem_ctl GETVAL failed for "
+               log_error("cookie inc: semid %d: sem_ctl GETVAL failed for "
                          "cookie 0x%" PRIx32 ": %s",
                          semid, cookie, strerror(errno));
-               return 0;               
+               return 0;
        }
 
        log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) incremented to %d",
@@ -2460,7 +2460,7 @@ static int _udev_notify_sem_dec(uint32_t cookie, int semid)
        int val;
 
        if ((val = semctl(semid, 0, GETVAL)) < 0) {
-               log_error("semid %d: sem_ctl GETVAL failed for "
+               log_error("cookie dec: semid %d: sem_ctl GETVAL failed for "
                          "cookie 0x%" PRIx32 ": %s",
                          semid, cookie, strerror(errno));
                return 0;
@@ -2469,13 +2469,13 @@ static int _udev_notify_sem_dec(uint32_t cookie, int semid)
        if (semop(semid, &sb, 1) < 0) {
                switch (errno) {
                        case EAGAIN:
-                               log_error("semid %d: semop failed for cookie "
+                               log_error("cookie dec: semid %d: semop failed for cookie "
                                          "0x%" PRIx32 ": "
                                          "incorrect semaphore state",
                                          semid, cookie);
                                break;
                        default:
-                               log_error("semid %d: semop failed for cookie "
+                               log_error("cookie dec: semid %d: semop failed for cookie "
                                          "0x%" PRIx32 ": %s",
                                          semid, cookie, strerror(errno));
                                break;
@@ -2562,7 +2562,7 @@ static int _udev_notify_sem_create(uint32_t *cookie, int *semid)
        sem_arg.val = 1;
 
        if (semctl(gen_semid, 0, SETVAL, sem_arg) < 0) {
-               log_error("semid %d: semctl failed: %s", gen_semid, strerror(errno));
+               log_error("cookie create: semid %d: semctl failed: %s", gen_semid, strerror(errno));
                /* We have to destroy just created semaphore
                 * so it won't stay in the system. */
                (void) _udev_notify_sem_destroy(gen_cookie, gen_semid);
@@ -2570,7 +2570,7 @@ static int _udev_notify_sem_create(uint32_t *cookie, int *semid)
        }
 
        if ((val = semctl(gen_semid, 0, GETVAL)) < 0) {
-               log_error("semid %d: sem_ctl GETVAL failed for "
+               log_error("cookie create: semid %d: sem_ctl GETVAL failed for "
                          "cookie 0x%" PRIx32 ": %s",
                          gen_semid, gen_cookie, strerror(errno));
                goto bad;