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

2010-05-18 16:23:33 -07:00 · 2010-05-18 16:23:33 -07:00 · d0fb672d5b
parent 85b46f9020 ac21bd7c44
commit d0fb672d5b
1 changed files with 1 additions and 2 deletions
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@ -948,11 +948,10 @@ zpool_find_import_impl(libzfs_handle_t *hdl, int argc, char **argv,

 			/*
 			 * Ignore failed stats.  We only want regular
-			 * files, character devs and block devs.
+			 * files and block devs.
 			 */
 			if (fstat64(fd, &statbuf) != 0 ||
 			    (!S_ISREG(statbuf.st_mode) &&
-			    !S_ISCHR(statbuf.st_mode) &&
 			    !S_ISBLK(statbuf.st_mode))) {
 				(void) close(fd);
 				continue;