summaryrefslogtreecommitdiff
path: root/device_mapper
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2021-12-08 10:56:21 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2021-12-20 16:13:28 +0100
commit39a121ddbcf83314c5a75e23671acbc6600292ce (patch)
tree38129cd55387a1e387018a91386fffc2cdad2dac /device_mapper
parent47ac2659d5f8544dcd53aeef13a42b3256f2fd6f (diff)
downloadlvm2-39a121ddbcf83314c5a75e23671acbc6600292ce.tar.gz
libdm: correct version check
If there ever would be API version 5, these check would give incorrect results.
Diffstat (limited to 'device_mapper')
-rw-r--r--device_mapper/ioctl/libdm-iface.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index 533bb9eea..925f18c6b 100644
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -616,8 +616,7 @@ int dm_check_version(void)
int dm_cookie_supported(void)
{
return (dm_check_version() &&
- _dm_version >= 4 &&
- _dm_version_minor >= 15);
+ ((_dm_version == 4) ? _dm_version_minor >= 15 : _dm_version > 4));
}
static int _dm_inactive_supported(void)
@@ -1441,8 +1440,7 @@ static int _udev_complete(struct dm_task *dmt)
static int _check_uevent_generated(struct dm_ioctl *dmi)
{
if (!dm_check_version() ||
- _dm_version < 4 ||
- _dm_version_minor < 17)
+ ((_dm_version == 4) ? _dm_version_minor < 17 : _dm_version < 4))
/* can't check, assume uevent is generated */
return 1;