libblkid: (zfs) don't probe whole-disk areas covered by partitions

Addresses: https://github.com/karelzak/util-linux/issues/918
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c
index e0c544917d8cccbdf8301717e0671ecb88013312..774a199e1b51e57034af74579391a9c8d03cdd31 100644 (file)
--- a/libblkid/src/superblocks/zfs.c
+++ b/libblkid/src/superblocks/zfs.c
@@ -278,6 +278,12 @@ static int probe_zfs(blkid_probe pr,
                        break;
                }
 
+               if ((S_ISREG(pr->mode) || blkid_probe_is_wholedisk(pr)) &&
+                   blkid_probe_is_covered_by_pt(pr,  offset, VDEV_LABEL_SIZE))
+                       /* ignore this area, it's within any partition and
+                        * we are working with whole-disk now */
+                       continue;
+
                label = blkid_probe_get_buffer(pr, offset, VDEV_LABEL_SIZE);
                if (label == NULL)
                        return errno ? -errno : 1;