diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index f528dba27b..7e31fba90e 100644
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@@ -1078,6 +1078,7 @@ zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg)
 			 * vcs*     - Virtual console memory.
 			 * parport* - Parallel port interface.
 			 * lp*      - Printer interface.
+			 * fd*      - Floppy interface.
 			 */
 			if ((strncmp(name, "watchdog", 8) == 0) ||
 			    (strncmp(name, "fuse", 4) == 0)     ||
@@ -1085,7 +1086,8 @@ zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg)
 			    (strncmp(name, "tty", 3) == 0)      ||
 			    (strncmp(name, "vcs", 3) == 0)      ||
 			    (strncmp(name, "parport", 7) == 0)  ||
-			    (strncmp(name, "lp", 2) == 0))
+			    (strncmp(name, "lp", 2) == 0)       ||
+			    (strncmp(name, "fd", 2) == 0))
 				continue;
 
 			if ((fd = openat64(dfd, name, O_RDONLY)) < 0)
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index d74eb84d8d..3c42e6cd4c 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -1079,7 +1079,7 @@ zio_taskq_dispatch(zio_t *zio, enum zio_taskq_type q, boolean_t cutinline)
 	ASSERT3U(q, <, ZIO_TASKQ_TYPES);
 
 	while (taskq_dispatch(spa->spa_zio_taskq[t][q],
-	    (task_func_t *)zio_execute, zio, flags) == 0); /* do nothing */
+	    (task_func_t *)__zio_execute, zio, flags) == 0); /* do nothing */
 }
 
 static boolean_t