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-05-23 09:45:42 -07:00
parent b6a8003f70 f36da16d36
commit 4eb91f73a1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libzfs/libzfs_import.c
View File

@ -943,6 +943,14 @@ zpool_find_import_impl(libzfs_handle_t *hdl, int argc, char **argv,
(name[1] == 0 || (name[1] == '.' && name[2] == 0))) (name[1] == 0 || (name[1] == '.' && name[2] == 0)))
continue; continue;
/*
* Do not open /dev/watchdog to stat it because
* it requires a special close or the watchdog
* with be triggered and the system reset.
*/
if (strcmp(name, "watchdog") == 0)
continue;
if ((fd = openat64(dfd, name, O_RDONLY)) < 0) if ((fd = openat64(dfd, name, O_RDONLY)) < 0)
continue; continue;