summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/libzfs_import.c
diff options
context:
space:
mode:
authoreschrock <none@none>2006-07-31 15:13:30 -0700
committereschrock <none@none>2006-07-31 15:13:30 -0700
commit3bb79bece53191f2cf27aa61a72ea1784a7ce700 (patch)
tree2ef162103e713655e9e6889a7ac7389d304f7c55 /usr/src/lib/libzfs/common/libzfs_import.c
parent79033acb8a0c499540c5c46e165cff4ccc2ebf59 (diff)
downloadillumos-joyent-3bb79bece53191f2cf27aa61a72ea1784a7ce700.tar.gz
6368751 libzfs interface for mount/umounting all the file systems for a given pool
6385349 zpool import -d /dev hangs 6397052 unmounting datasets should process /etc/mnttab instead of traverse DSL 6403510 zfs remount,noatime option broken 6423412 Two spaces lines are unnecessary after 'zpool import -a' 6434054 'zfs destroy' core dumps if clone is namespace-parent of origin 6440515 namespace_reload() can leak memory on allocation faiure 6440592 nvlist_dup() should not fill in destination pointer on error 6446060 zfs get does not consistently report temporary properties 6448326 zfs(1) 'list' command crashes if hidden property createtxg is requested 6450653 get_dependents() has poor error semantics --HG-- rename : usr/src/cmd/zpool/zpool_dataset.c => deleted_files/usr/src/cmd/zpool/zpool_dataset.c
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_import.c')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_import.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_import.c b/usr/src/lib/libzfs/common/libzfs_import.c
index dbc3b9dd1a..6b76b2922c 100644
--- a/usr/src/lib/libzfs/common/libzfs_import.c
+++ b/usr/src/lib/libzfs/common/libzfs_import.c
@@ -788,6 +788,13 @@ zpool_find_import(libzfs_handle_t *hdl, int argc, char **argv)
if (S_ISDIR(statbuf.st_mode))
continue;
+ /*
+ * Ignore special (non-character or non-block) files.
+ */
+ if (!S_ISREG(statbuf.st_mode) &&
+ !S_ISBLK(statbuf.st_mode))
+ continue;
+
if ((fd = open64(path, O_RDONLY)) < 0)
continue;