X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=6b9afe3abf4ce0180cb3957da00cdd8036ac6cf7;hb=910f2c4845003968bb83824d2e4475ed7e247b59;hp=59d8a8fc49a96edf8327e85ea033879555e87487;hpb=88e3c2f5610b9ac89b0923d448fee34140fc46fb;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 59d8a8fc4..6b9afe3ab 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -4399,43 +4399,6 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		goto skip_setup;
 	}
 
-	/* Create directories if consumer is LOCAL and has a path defined. */
-	if (usess->consumer->type == CONSUMER_DST_LOCAL &&
-			usess->consumer->dst.session_root_path[0] != '\0') {
-		char *tmp_path;
-
-		tmp_path = zmalloc(LTTNG_PATH_MAX);
-		if (!tmp_path) {
-			ERR("Alloc tmp_path");
-			goto error_unlock;
-		}
-		ret = snprintf(tmp_path, LTTNG_PATH_MAX, "%s%s%s",
-				usess->consumer->dst.session_root_path,
-				usess->consumer->chunk_path,
-				usess->consumer->subdir);
-		if (ret >= LTTNG_PATH_MAX) {
-			ERR("Local destination path exceeds the maximal allowed length of %i bytes (needs %i bytes) with path = \"%s%s%s\"",
-					LTTNG_PATH_MAX, ret,
-					usess->consumer->dst.session_root_path,
-					usess->consumer->chunk_path,
-					usess->consumer->subdir);
-			free(tmp_path);
-			goto error_unlock;
-		}
-
-		DBG("Creating directory path for local tracing: \"%s\"",
-				tmp_path);
-		ret = run_as_mkdir_recursive(tmp_path, S_IRWXU | S_IRWXG,
-				ua_sess->euid, ua_sess->egid);
-		free(tmp_path);
-		if (ret < 0) {
-			if (errno != EEXIST) {
-				ERR("Trace directory creation error");
-				goto error_unlock;
-			}
-		}
-	}
-
 	/*
 	 * Create the metadata for the application. This returns gracefully if a
 	 * metadata was already set for the session.
@@ -6343,7 +6306,7 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 			ret = snprintf(pathname, sizeof(pathname),
 					DEFAULT_UST_TRACE_DIR "/" DEFAULT_UST_TRACE_UID_PATH,
 					reg->uid, reg->bits_per_long);
-			if (ret < 0 || ret == sizeof(pathname)) {
+			if (ret < 0 || ret >= sizeof(pathname)) {
 				PERROR("Failed to format rotation path");
 				cmd_ret = LTTNG_ERR_INVALID;
 				goto error;
@@ -6396,7 +6359,7 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 			ret = snprintf(pathname, sizeof(pathname),
 					DEFAULT_UST_TRACE_DIR "/%s",
 					ua_sess->path);
-			if (ret < 0 || ret == sizeof(pathname)) {
+			if (ret < 0 || ret >= sizeof(pathname)) {
 				PERROR("Failed to format rotation path");
 				cmd_ret = LTTNG_ERR_INVALID;
 				goto error;