Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2010-08-12 15:25:39 -07:00
parent ea708904a7 b1ee7f46b9
commit 5bc88421a7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libzfs/libzfs_import.c
View File

@ -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)

2
module/zfs/zio.c
View File

@ -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