Add kernel module auto-loading

[mirror_zfs.git] / lib / libzfs / libzfs_util.c

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index bc51a76a8ecb3475292430bf8b21e3ee99f827bb..9703f844f6eec7f929e0af5ba4d0daf0dd97873b 100644 (file)
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -963,13 +963,14 @@ libzfs_load_module(const char *module)
                                load = 0;
                }
 
-               if (load && libzfs_run_process("/sbin/modprobe", argv, 0))
-                       return (ENOEXEC);
-       }
+               if (load) {
+                       if (libzfs_run_process("/sbin/modprobe", argv, 0))
+                               return (ENOEXEC);
 
-       /* Module loading is synchronous it must be available */
-       if (!libzfs_module_loaded(module))
-               return (ENXIO);
+                       if (!libzfs_module_loaded(module))
+                               return (ENXIO);
+               }
+       }
 
        /*
         * Device creation by udev is asynchronous and waiting may be