X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmodprobe.c;h=347829d5dbdd09c29bcd605e9b88e671be827394;hb=e6a9d253500d10bfbb64b2ce51e39e73c6cc2296;hp=ca0467eb37973f169cdebc7966bbb613e83285a9;hpb=d06773cf79bd49a8385b8e38b1d3b2633271feed;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index ca0467eb3..347829d5d 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -197,6 +197,7 @@ static int modprobe_lttng(struct kern_modules_param *modules,
 			}
 		} else {
 			DBG("Modprobe successfully %s", modules[i].name);
+			modules[i].loaded = true;
 		}
 
 		kmod_module_unref(mod);
@@ -271,6 +272,10 @@ static void modprobe_remove_lttng(const struct kern_modules_param *modules,
 	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);
@@ -337,6 +342,7 @@ static int modprobe_lttng(struct kern_modules_param *modules,
 			}
 		} else {
 			DBG("Modprobe successfully %s", modules[i].name);
+			modules[i].loaded;
 		}
 	}
 
@@ -351,6 +357,9 @@ static void modprobe_remove_lttng(const struct kern_modules_param *modules,
 	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);