summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2016-05-06 13:59:50 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2016-05-06 16:48:16 +0200
commit1202713f94cb2b0f6f5160d49615f4b839a862a7 (patch)
tree8a98794eccb6696e964be4cccddb45eacd3c55b2
parent2842a645fdb66ce1f90cad1fd206912eef365059 (diff)
downloadlvm2-1202713f94cb2b0f6f5160d49615f4b839a862a7.tar.gz
activation: activation check is mandatory
Make missing activation() check before calling target_persent an INTERNAL_ERROR.
-rw-r--r--lib/activate/activate.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 712f86c17..1ef83d3eb 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -636,9 +636,10 @@ int target_present_version(struct cmd_context *cmd, const char *target_name,
int use_modprobe,
uint32_t *maj, uint32_t *min, uint32_t *patchlevel)
{
- if (!activation())
- return_0;
-
+ if (!activation()) {
+ log_error(INTERNAL_ERROR "Target present version called when activation is disabled.");
+ return 0;
+ }
#ifdef MODPROBE_CMD
if (use_modprobe) {
if (target_version(target_name, maj, min, patchlevel))