summaryrefslogtreecommitdiffstats
path: root/libblkid
diff options
context:
space:
mode:
authorTony Asleson2018-03-08 22:41:26 +0100
committerKarel Zak2018-03-09 13:34:42 +0100
commit80ec018c6a0cf321f7b5d57de948354b0850cc8a (patch)
tree258ccad7df7c329d00bf48bf945d9ad7ce387c87 /libblkid
parentdocs: add new idea to TODO list (diff)
downloadkernel-qcow2-util-linux-80ec018c6a0cf321f7b5d57de948354b0850cc8a.tar.gz
kernel-qcow2-util-linux-80ec018c6a0cf321f7b5d57de948354b0850cc8a.tar.xz
kernel-qcow2-util-linux-80ec018c6a0cf321f7b5d57de948354b0850cc8a.zip
libblkid: ignore private Stratis devices
[kzak@redhat.com: - tiny coding style changes] References: 20e1c3dc03399d6988ef35dedc1364cfc12e9263 Signed-off-by: Tony Asleson <tasleson@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid')
-rw-r--r--libblkid/src/probe.c4
-rw-r--r--libblkid/src/verify.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 74eaffd2b..647ae416a 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -923,8 +923,8 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
pr->flags |= BLKID_FL_TINY_DEV;
if (S_ISBLK(sb.st_mode) &&
- sysfs_devno_is_lvm_private(sb.st_rdev, &dm_uuid)) {
- DBG(LOWPROBE, ul_debug("ignore private LVM device"));
+ sysfs_devno_is_dm_private(sb.st_rdev, &dm_uuid)) {
+ DBG(LOWPROBE, ul_debug("ignore private device mapper device"));
pr->flags |= BLKID_FL_NOSCAN_DEV;
}
diff --git a/libblkid/src/verify.c b/libblkid/src/verify.c
index d84894b10..7f44f5497 100644
--- a/libblkid/src/verify.c
+++ b/libblkid/src/verify.c
@@ -114,7 +114,7 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
(unsigned long)diff));
#endif
- if (sysfs_devno_is_lvm_private(st.st_rdev, NULL)) {
+ if (sysfs_devno_is_dm_private(st.st_rdev, NULL)) {
blkid_free_dev(dev);
return NULL;
}