X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibzfs%2Flibzfs_util.c;h=163cd1671fa9f0b17a528d9a29ca5b7062026b03;hb=1ac0ea38a5b19771b0dfbc6b2244c4f674ef1a31;hp=01995f802e38c08624fb7b64cc0b94273999dabb;hpb=79e7242a91c17f50c857b53d2a7313cf363ea535;p=zfs.git

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index 01995f8..163cd16 100644
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -631,7 +631,7 @@ libzfs_module_loaded(const char *module)
 	return result;
 }
 
-static int
+int
 libzfs_run_process(const char *path, char *argv[])
 {
 	pid_t pid;
@@ -657,14 +657,15 @@ libzfs_run_process(const char *path, char *argv[])
 	return -1;
 }
 
-static int
+int
 libzfs_load_module(const char *module)
 {
 	char *argv[4] = {"/sbin/modprobe", "-q", (char *)module, (char *)0};
 
 	if (libzfs_module_loaded(module))
 		return 0;
-	return libzfs_run_process("modprobe", argv);
+
+	return libzfs_run_process("/sbin/modprobe", argv);
 }
 
 libzfs_handle_t *
@@ -726,9 +727,7 @@ libzfs_fini(libzfs_handle_t *hdl)
 #endif
 	if (hdl->libzfs_sharetab)
 		(void) fclose(hdl->libzfs_sharetab);
-#ifdef HAVE_ZPL
 	zfs_uninit_libshare(hdl);
-#endif
 	if (hdl->libzfs_log_str)
 		(void) free(hdl->libzfs_log_str);
 	zpool_free_handles(hdl);