d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we cannot open /dev/zfs try to load zfs.ko automatically and reopen.

Browse Source
This commit is contained in:
Pawel Jakub Dawidek 2007-04-08 03:02:08 +00:00
parent 264de85e73
commit 902cbe0df8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=168484
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
View File

@ -490,6 +490,21 @@ libzfs_print_on_error(libzfs_handle_t *hdl, boolean_t printerr)
hdl->libzfs_printerr = printerr;
}
static int
libzfs_load(void)
{
int error;
if (modfind("zfs") < 0) {
/* Not present in kernel, try loading it. */
if (kldload("zfs") < 0 || modfind("zfs") < 0) {
if (errno != EEXIST)
return (error);
}
}
return (0);
}
libzfs_handle_t *
libzfs_init(void)
{
@ -500,8 +515,12 @@ libzfs_init(void)
}
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
free(hdl);
return (NULL);
if (libzfs_load() == 0)
hdl->libzfs_fd = open(ZFS_DEV, O_RDWR);
if (hdl->libzfs_fd < 0) {
free(hdl);
return (NULL);
}
}
if ((hdl->libzfs_mnttab = fopen(MNTTAB, "r")) == NULL) {

23
contrib/opensolaris/lib/libzfs/common/libzfs_util.c
View File

@ -490,6 +490,21 @@ libzfs_print_on_error(libzfs_handle_t *hdl, boolean_t printerr)
hdl->libzfs_printerr = printerr;
}
static int
libzfs_load(void)
{
int error;
if (modfind("zfs") < 0) {
/* Not present in kernel, try loading it. */
if (kldload("zfs") < 0 || modfind("zfs") < 0) {
if (errno != EEXIST)
return (error);
}
}
return (0);
}
libzfs_handle_t *
libzfs_init(void)
{
@ -500,8 +515,12 @@ libzfs_init(void)
}
if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
free(hdl);
return (NULL);
if (libzfs_load() == 0)
hdl->libzfs_fd = open(ZFS_DEV, O_RDWR);
if (hdl->libzfs_fd < 0) {
free(hdl);
return (NULL);
}
}
if ((hdl->libzfs_mnttab = fopen(MNTTAB, "r")) == NULL) {