X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=2ebf79d2828c251da2d2e16469a33e3aed01906f;hb=3e230f922d67f7a47b66631f7a8cf458002b3727;hp=8b1665a06568de2bc90a4a90e61b40e35af4800c;hpb=fb54cdbf2a8ff53e9dc11403a8aca643bbdde9c0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 8b1665a06..2ebf79d28 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -712,10 +712,6 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 	ret = ustctl_create_event(app->sock, &ua_event->attr, ua_chan->obj,
 			&ua_event->obj);
 	if (ret < 0) {
-		if (ret == -EEXIST || ret == -EPERM) {
-			ret = 0;
-			goto error;
-		}
 		ERR("Error ustctl create event %s for app pid: %d with ret %d",
 				ua_event->attr.name, app->pid, ret);
 		goto error;
@@ -738,10 +734,10 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 			 * just created it.
 			 */
 			switch (ret) {
-			case -EPERM:
+			case -LTTNG_UST_ERR_PERM:
 				/* Code flow problem */
 				assert(0);
-			case -EEXIST:
+			case -LTTNG_UST_ERR_EXIST:
 				/* It's OK for our use case. */
 				ret = 0;
 				break;
@@ -1227,7 +1223,7 @@ static struct ust_app_channel *create_ust_app_channel(
 	ret = create_ust_channel(app, ua_sess, ua_chan);
 	if (ret < 0) {
 		/* Not found previously means that it does not exist on the tracer */
-		assert(ret != -EEXIST);
+		assert(ret != -LTTNG_UST_ERR_EXIST);
 		goto error;
 	}
 
@@ -1278,7 +1274,7 @@ int create_ust_app_event(struct ust_app_session *ua_sess,
 	ret = create_ust_event(app, ua_sess, ua_chan, ua_event);
 	if (ret < 0) {
 		/* Not found previously means that it does not exist on the tracer */
-		assert(ret != -EEXIST);
+		assert(ret == -LTTNG_UST_ERR_EXIST);
 		goto error;
 	}
 
@@ -2147,7 +2143,7 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess,
 
 		ret = create_ust_app_event(ua_sess, ua_chan, uevent, app);
 		if (ret < 0) {
-			if (ret != -EEXIST) {
+			if (ret != -LTTNG_UST_ERR_EXIST) {
 				/* Possible value at this point: -ENOMEM. If so, we stop! */
 				break;
 			}