{ "lttng-probe-ext3" },
{ "lttng-probe-ext4" },
{ "lttng-probe-gpio" },
+ { "lttng-probe-i2c" },
{ "lttng-probe-irq" },
{ "lttng-probe-jbd" },
{ "lttng-probe-jbd2" },
goto error;
}
- ret = kmod_module_probe_insert_module(mod, KMOD_PROBE_IGNORE_LOADED,
+ ret = kmod_module_probe_insert_module(mod, 0,
NULL, NULL, NULL, NULL);
- if (ret < 0) {
+ if (ret == -EEXIST) {
+ DBG("Module %s is already loaded", modules[i].name);
+ ret = 0;
+ } else if (ret < 0) {
if (required) {
ERR("Unable to load required module %s",
modules[i].name);
}
} else {
DBG("Modprobe successfully %s", modules[i].name);
+ modules[i].loaded = true;
}
kmod_module_unref(mod);
for (i = entries - 1; i >= 0; i--) {
struct kmod_module *mod = NULL;
+ if (!modules[i].loaded) {
+ continue;
+ }
+
ret = kmod_module_new_from_name(ctx, modules[i].name, &mod);
if (ret < 0) {
PERROR("Failed to create kmod module for %s", modules[i].name);
}
} else {
DBG("Modprobe successfully %s", modules[i].name);
+ modules[i].loaded = true;
}
}
char modprobe[256];
for (i = entries - 1; i >= 0; i--) {
+ if (!modules[i].loaded) {
+ continue;
+ }
ret = snprintf(modprobe, sizeof(modprobe),
"/sbin/modprobe -r -q %s",
modules[i].name);