summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
index 62a0978592..0998fc3860 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
@@ -16,17 +16,17 @@ Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com>
16Signed-off-by: He Zhe <zhe.he@windriver.com> 16Signed-off-by: He Zhe <zhe.he@windriver.com>
17Upstream-Status: Pending 17Upstream-Status: Pending
18--- 18---
19 src/bin/lttng-sessiond/cmd.c | 8 -------- 19 src/bin/lttng-sessiond/cmd.c | 8 --------
20 1 file changed, 8 deletions(-) 20 1 file changed, 8 deletions(-)
21 21
22diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c 22diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
23index 73b4ce3..36f62ee 100644 23index cf30b8e..cc41a48 100644
24--- a/src/bin/lttng-sessiond/cmd.c 24--- a/src/bin/lttng-sessiond/cmd.c
25+++ b/src/bin/lttng-sessiond/cmd.c 25+++ b/src/bin/lttng-sessiond/cmd.c
26@@ -689,14 +689,6 @@ close_sock: 26@@ -945,14 +945,6 @@ static int send_consumer_relayd_socket(enum lttng_domain_type domain,
27 free(rsock); 27 */
28 28
29 error: 29 close_sock:
30- if (ret != LTTNG_OK) { 30- if (ret != LTTNG_OK) {
31- /* 31- /*
32- * The consumer output for this session should not be used anymore 32- * The consumer output for this session should not be used anymore
@@ -35,9 +35,8 @@ index 73b4ce3..36f62ee 100644
35- */ 35- */
36- consumer->enabled = 0; 36- consumer->enabled = 0;
37- } 37- }
38 return ret; 38 (void) relayd_close(rsock);
39 } 39 free(rsock);
40 40
41-- 41--
421.7.9.5 422.17.1
43