You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
2.0 KiB
51 lines
2.0 KiB
7 years ago
|
WHATS_NEW | 4 ++++
|
||
|
|
daemons/lvmetad/lvmetad-core.c | 9 ++++++---
|
||
|
|
2 files changed, 10 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/WHATS_NEW b/WHATS_NEW
|
||
|
|
index 519bbc9..8ae2df8 100644
|
||
|
|
--- a/WHATS_NEW
|
||
|
|
+++ b/WHATS_NEW
|
||
|
|
@@ -1,3 +1,7 @@
|
||
|
|
+Version 2.02.169 -
|
||
|
|
+=====================================
|
||
|
|
+ Fix segfault in lvmetad from missing NULL in daemon_reply_simple.
|
||
|
|
+
|
||
|
|
Version 2.02.167 -
|
||
|
|
======================================
|
||
|
|
Prevent raid4 creation/conversion on non-supporting kernels
|
||
|
|
diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c
|
||
|
|
index 36a5cec..c46c7ac 100644
|
||
|
|
--- a/daemons/lvmetad/lvmetad-core.c
|
||
|
|
+++ b/daemons/lvmetad/lvmetad-core.c
|
||
|
|
@@ -2745,7 +2745,8 @@ static response handler(daemon_state s, client_handle h, request r)
|
||
|
|
"expected = %s", state->token,
|
||
|
|
"received = %s", token,
|
||
|
|
"update_pid = " FMTd64, (int64_t)state->update_pid,
|
||
|
|
- "reason = %s", "another command has populated the cache");
|
||
|
|
+ "reason = %s", "another command has populated the cache",
|
||
|
|
+ NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
DEBUGLOG(state, "token_update end len %d pid %d new token %s",
|
||
|
|
@@ -2778,7 +2779,8 @@ static response handler(daemon_state s, client_handle h, request r)
|
||
|
|
"expected = %s", state->token,
|
||
|
|
"received = %s", token,
|
||
|
|
"update_pid = " FMTd64, (int64_t)state->update_pid,
|
||
|
|
- "reason = %s", "another command has populated the cache");
|
||
|
|
+ "reason = %s", "another command has populated the cache",
|
||
|
|
+ NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* If a pid doing update was cancelled, ignore its update messages. */
|
||
|
|
@@ -2793,7 +2795,8 @@ static response handler(daemon_state s, client_handle h, request r)
|
||
|
|
"expected = %s", state->token,
|
||
|
|
"received = %s", token,
|
||
|
|
"update_pid = " FMTd64, (int64_t)state->update_pid,
|
||
|
|
- "reason = %s", "another command has populated the lvmetad cache");
|
||
|
|
+ "reason = %s", "another command has populated the lvmetad cache",
|
||
|
|
+ NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
pthread_mutex_unlock(&state->token_lock);
|