Fix zvol detection

The zpool create subcomand should not return an error on debug builds of
the userland tools when given zvols.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3595

diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index b3905d7f3bfd14b3db7a5734c07114dd59a10ab0..785cfe63b2962bd1b53f34c8fe4f121ccd154a5f 100644 (file)
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -210,6 +210,12 @@ efi_get_info(int fd, struct dk_cinfo *dki_info)
                rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
                    dki_info->dki_dname,
                    &dki_info->dki_partition);
+       } else if ((strncmp(dev_path, "/dev/zd", 7) == 0)) {
+               strcpy(dki_info->dki_cname, "zd");
+               dki_info->dki_ctype = DKC_MD;
+               rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
+                   dki_info->dki_dname,
+                   &dki_info->dki_partition);
        } else if ((strncmp(dev_path, "/dev/dm-", 8) == 0)) {
                strcpy(dki_info->dki_cname, "pseudo");
                dki_info->dki_ctype = DKC_VBD;