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

Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-08-12 15:23:54 -07:00
parent 0125eb04c0 0cb77d992d
commit d07fd603e1
1 changed files with 3 additions and 1 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. * vcs* - Virtual console memory.
* parport* - Parallel port interface. * parport* - Parallel port interface.
* lp* - Printer interface. * lp* - Printer interface.
* fd* - Floppy interface.
*/ */
if ((strncmp(name, "watchdog", 8) == 0) || if ((strncmp(name, "watchdog", 8) == 0) ||
(strncmp(name, "fuse", 4) == 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, "tty", 3) == 0) ||
(strncmp(name, "vcs", 3) == 0) || (strncmp(name, "vcs", 3) == 0) ||
(strncmp(name, "parport", 7) == 0) || (strncmp(name, "parport", 7) == 0) ||
(strncmp(name, "lp", 2) == 0)) (strncmp(name, "lp", 2) == 0) ||
(strncmp(name, "fd", 2) == 0))
continue; continue;
if ((fd = openat64(dfd, name, O_RDONLY)) < 0) if ((fd = openat64(dfd, name, O_RDONLY)) < 0)