From 710dd492394be6cd2f3dd65c057ae7827ee6e89d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 18 Nov 2015 11:55:35 +0100 Subject: [PATCH] blkid: don't mark zfs as RAID Signed-off-by: Karel Zak --- libblkid/src/probe.c | 5 +++-- libblkid/src/superblocks/zfs.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c index 9f81099598..97238fc305 100644 --- 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 60e6c7aa87..371fd61da5 100644 --- 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 -- 2.47.3