diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-05-26 00:19:28 +0200 |
---|---|---|
committer | Marian Csontos <mcsontos@redhat.com> | 2021-08-11 13:00:36 +0200 |
commit | 64d9fb38adb34aacbd69487e95bc523d32a48e50 (patch) | |
tree | ae447186a3f5d8437ae4123977cb4b05fee837d9 | |
parent | 01b05cf51dd547354b4ad70e7f8f4ff7ff0bb152 (diff) | |
download | lvm2-64d9fb38adb34aacbd69487e95bc523d32a48e50.tar.gz |
vdo: fix preload of kvdo
Commit 5bf1dba9eb8a8b77410e386e59dadeb27801b14e broke load of kvdo
kernel module - correct it by loading kvdo instead of trying dm-vdo.
(cherry picked from commit b725b5ea6ecfeef428fd7ffcd6855a38378d761b)
Conflicts:
WHATS_NEW
-rw-r--r-- | WHATS_NEW | 4 | ||||
-rw-r--r-- | lib/activate/activate.c | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -1,3 +1,7 @@ +Version 2.03.13 - +=============================== + Fix load of kvdo target when it is not present in memory (2.03.12). + Version 2.03.12 - 07th May 2021 =============================== Allow attaching cache to thin data volume. diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 71db98191..6bda7385b 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -574,13 +574,9 @@ int module_present(struct cmd_context *cmd, const char *target_name) } #ifdef MODPROBE_CMD - if (strcmp(target_name, MODULE_NAME_VDO) == 0) { - argv[1] = target_name; /* ATM kvdo is without dm- prefix */ - if ((ret = exec_cmd(cmd, argv, NULL, 0))) - return ret; - } - - if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) { + if (strcmp(target_name, TARGET_NAME_VDO) == 0) + argv[1] = MODULE_NAME_VDO; /* ATM kvdo is without dm- prefix */ + else if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) { log_error("module_present module name too long: %s", target_name); return 0; |