X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev-builtin-kmod.c;h=57e813f863cc8a0f69a8bebfea06075b36fa3816;hp=68536f17ffca1d078b36659568e9d856a78e2083;hb=96b2eef25bb43c62f8d6b914a04fd72d8a968d65;hpb=6a6b254354ecb71e67be5fdb87e869adf075c6f6;ds=sidebyside

diff --git a/src/udev-builtin-kmod.c b/src/udev-builtin-kmod.c
index 68536f17f..57e813f86 100644
--- a/src/udev-builtin-kmod.c
+++ b/src/udev-builtin-kmod.c
@@ -35,114 +35,108 @@ static struct kmod_ctx *ctx;
 
 static int load_module(struct udev *udev, const char *alias)
 {
-	struct kmod_list *list = NULL;
-	struct kmod_list *listb = NULL;
-	struct kmod_list *l;
-	int err;
-
-	err = kmod_module_new_from_lookup(ctx, alias, &list);
-	if (err < 0)
-		return err;
-
-	err = kmod_module_get_filtered_blacklist(ctx, list, &listb);
-	if (err < 0)
-		return err;
-
-	if (list == NULL)
-		info(udev, "no module matches '%s'\n", alias);
-	else if (listb == NULL)
-		info(udev, "modules matching '%s' are blacklisted\n", alias);
-
-	kmod_list_foreach(l, listb) {
-		struct kmod_module *mod = kmod_module_get_module(l);
-
-		err = kmod_module_probe_insert_module(mod, 0, NULL, NULL, NULL);
-		if (err >=0 )
-			info(udev, "inserted '%s'\n", kmod_module_get_name(mod));
-		else
-			info(udev, "failed to insert '%s'\n", kmod_module_get_name(mod));
-
-		kmod_module_unref(mod);
-	}
-
-	kmod_module_unref_list(list);
-	kmod_module_unref_list(listb);
-	return err;
+        struct kmod_list *list = NULL;
+        struct kmod_list *l;
+        int err;
+
+        err = kmod_module_new_from_lookup(ctx, alias, &list);
+        if (err < 0)
+                return err;
+
+        if (list == NULL)
+                info(udev, "no module matches '%s'\n", alias);
+
+        kmod_list_foreach(l, list) {
+                struct kmod_module *mod = kmod_module_get_module(l);
+
+                err = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST, NULL, NULL, NULL, NULL);
+                if (err == KMOD_PROBE_APPLY_BLACKLIST)
+                        info(udev, "module '%s' is blacklisted\n", kmod_module_get_name(mod));
+                else if (err == 0)
+                        info(udev, "inserted '%s'\n", kmod_module_get_name(mod));
+                else
+                        info(udev, "failed to insert '%s'\n", kmod_module_get_name(mod));
+
+                kmod_module_unref(mod);
+        }
+
+        kmod_module_unref_list(list);
+        return err;
 }
 
 static void udev_kmod_log(void *data, int priority, const char *file, int line,
-			  const char *fn, const char *format, va_list args)
+                          const char *fn, const char *format, va_list args)
 {
-	udev_main_log(data, priority, file, line, fn, format, args);
+        udev_main_log(data, priority, file, line, fn, format, args);
 }
 
 /* needs to re-instantiate the context after a reload */
 static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test)
 {
-	struct udev *udev = udev_device_get_udev(dev);
-	int i;
-
-	if (!ctx) {
-		ctx = kmod_new(NULL, NULL);
-		if (!ctx)
-			return -ENOMEM;
-
-		info(udev, "load module index\n");
-		kmod_set_log_fn(ctx, udev_kmod_log, udev);
-		kmod_load_resources(ctx);
-	}
-
-	if (argc < 3 || strcmp(argv[1], "load")) {
-		err(udev, "expect: %s load <module>\n", argv[0]);
-		return EXIT_FAILURE;
-	}
-
-	for (i = 2; argv[i]; i++) {
-		info(udev, "execute '%s' '%s'\n", argv[1], argv[i]);
-		load_module(udev, argv[i]);
-	}
-
-	return EXIT_SUCCESS;
+        struct udev *udev = udev_device_get_udev(dev);
+        int i;
+
+        if (!ctx) {
+                ctx = kmod_new(NULL, NULL);
+                if (!ctx)
+                        return -ENOMEM;
+
+                info(udev, "load module index\n");
+                kmod_set_log_fn(ctx, udev_kmod_log, udev);
+                kmod_load_resources(ctx);
+        }
+
+        if (argc < 3 || strcmp(argv[1], "load")) {
+                err(udev, "expect: %s load <module>\n", argv[0]);
+                return EXIT_FAILURE;
+        }
+
+        for (i = 2; argv[i]; i++) {
+                info(udev, "execute '%s' '%s'\n", argv[1], argv[i]);
+                load_module(udev, argv[i]);
+        }
+
+        return EXIT_SUCCESS;
 }
 
 /* called at udev startup */
 static int builtin_kmod_init(struct udev *udev)
 {
-	if (ctx)
-		return 0;
+        if (ctx)
+                return 0;
 
-	ctx = kmod_new(NULL, NULL);
-	if (!ctx)
-		return -ENOMEM;
+        ctx = kmod_new(NULL, NULL);
+        if (!ctx)
+                return -ENOMEM;
 
-	info(udev, "load module index\n");
-	kmod_set_log_fn(ctx, udev_kmod_log, udev);
-	kmod_load_resources(ctx);
-	return 0;
+        info(udev, "load module index\n");
+        kmod_set_log_fn(ctx, udev_kmod_log, udev);
+        kmod_load_resources(ctx);
+        return 0;
 }
 
 /* called on udev shutdown and reload request */
 static void builtin_kmod_exit(struct udev *udev)
 {
-	info(udev, "unload module index\n");
-	ctx = kmod_unref(ctx);
+        info(udev, "unload module index\n");
+        ctx = kmod_unref(ctx);
 }
 
 /* called every couple of seconds during event activity; 'true' if config has changed */
 static bool builtin_kmod_validate(struct udev *udev)
 {
-	info(udev, "validate module index\n");
-	if (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK)
-		return true;
-	return false;
+        info(udev, "validate module index\n");
+        if (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK)
+                return true;
+        return false;
 }
 
 const struct udev_builtin udev_builtin_kmod = {
-	.name = "kmod",
-	.cmd = builtin_kmod,
-	.init = builtin_kmod_init,
-	.exit = builtin_kmod_exit,
-	.validate = builtin_kmod_validate,
-	.help = "kernel module loader",
-	.run_once = false,
+        .name = "kmod",
+        .cmd = builtin_kmod,
+        .init = builtin_kmod_init,
+        .exit = builtin_kmod_exit,
+        .validate = builtin_kmod_validate,
+        .help = "kernel module loader",
+        .run_once = false,
 };