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

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-01-14 14:27:46 -08:00
parent ba73fb12d8 c2ffd0ef60
commit 922f424be6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libzfs/libzfs_util.c
View File

@ -567,8 +567,16 @@ libzfs_init(void)
#endif #endif
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) { if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
free(hdl); /* XXX: Allow this failure on linux systems for now. It
return (NULL); * occurs when we attempt to open the /dev/zfs without the
* ZFS module stack loaded. This is normally a problem but
* tools such as zdb call this function and never use the
* ioctl() interface. Long term this should be cleaned up.
*/
if (errno != ENXIO) {
free(hdl);
return (NULL);
}
} }
#ifdef HAVE_SETMNTENT #ifdef HAVE_SETMNTENT
@ -592,7 +600,8 @@ libzfs_init(void)
void void
libzfs_fini(libzfs_handle_t *hdl) libzfs_fini(libzfs_handle_t *hdl)
{ {
(void) close(hdl->libzfs_fd); if (hdl->libzfs_fd != -1)
(void) close(hdl->libzfs_fd);
if (hdl->libzfs_mnttab) if (hdl->libzfs_mnttab)
#ifdef HAVE_SETMNTENT #ifdef HAVE_SETMNTENT
(void) endmntent(hdl->libzfs_mnttab); (void) endmntent(hdl->libzfs_mnttab);