diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-02-17 11:12:11 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-02-17 11:21:35 +0100 |
| commit | 5bf1dba9eb8a8b77410e386e59dadeb27801b14e (patch) | |
| tree | 3543dc9fefe2b7400758b808bed2db89a69fb2f7 | |
| parent | a7cb25c877ad70c48fa66258f8e3f2157e2e2be5 (diff) | |
| download | lvm2-5bf1dba9eb8a8b77410e386e59dadeb27801b14e.tar.gz | |
vdo: just one probe is enough
target_present_version() can handle modprobing no need to try it
twice.
| -rw-r--r-- | lib/vdo/vdo.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/vdo/vdo.c b/lib/vdo/vdo.c index f26874ce5..52e9443ea 100644 --- a/lib/vdo/vdo.c +++ b/lib/vdo/vdo.c @@ -414,13 +414,9 @@ static int _vdo_target_present(struct cmd_context *cmd, if (!_vdo_checked) { _vdo_checked = 1; - if (!target_present_version(cmd, TARGET_NAME_VDO, 0, - &maj, &min, &patchlevel)) { - /* Try to load kmod VDO module */ - if (!module_present(cmd, MODULE_NAME_VDO) || - !target_version(TARGET_NAME_VDO, &maj, &min, &patchlevel)) - return 0; - } + if (!target_present_version(cmd, TARGET_NAME_VDO, 1, + &maj, &min, &patchlevel)) + return 0; if (maj < 6 || (maj == 6 && min < 2)) { log_warn("WARNING: Target %s version %u.%u.%u is too old.", |