blkid: don't mark zfs as RAID

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 9f81099598482a513945477029b4f6d081a93b6a..97238fc3059bf9f29fc93d02f5c3444565f83a3c 100644 (file)
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -754,8 +754,9 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
                                list_entry(p, struct blkid_bufinfo, bufs);
 
                if (real_off >= x->off && real_off + len <= x->off + x->len) {
-                       DBG(BUFFER, ul_debug("\treuse %p: off=%jd len=%jd",
-                                               x->data, x->off, x->len));
+                       DBG(BUFFER, ul_debug("\treuse %p: off=%jd len=%jd (for off=%jd len=%jd)",
+                                               x->data, x->off, x->len,
+                                               real_off, len));
                        bf = x;
                        break;
                }

diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c
index 60e6c7aa874dd2dc1354a02929163d6d9a08f3de..371fd61da54cc36819b802c4b075f637c1db3f53 100644 (file)
--- a/libblkid/src/superblocks/zfs.c
+++ b/libblkid/src/superblocks/zfs.c
@@ -263,7 +263,7 @@ static int probe_zfs(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo zfs_idinfo =
 {
        .name           = "zfs_member",
-       .usage          = BLKID_USAGE_RAID,
+       .usage          = BLKID_USAGE_FILESYSTEM,
        .probefunc      = probe_zfs,
        .minsz          = 64 * 1024 * 1024,
        .magics         = BLKID_NONE_MAGIC