From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sun, 6 Sep 2015 23:40:42 +0000 (-0400)
Subject: Clean-up and simplify event_agent_disable_all
X-Git-Tag: v2.7.0-rc2~43
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=467849e2207c308e36aa801171b1063bb67c6020;p=lttng-tools.git

Clean-up and simplify event_agent_disable_all

event_agent_disable_all contains comments which make no sense since
they were blindly copy-pasted from event_agent_enable_all.

Also add an error_unlock label instead of open coding the unlock
on error.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index b0652bed0..f63364a85 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -641,7 +641,7 @@ int event_agent_disable_all(struct ltt_ust_session *usess,
 		goto error;
 	}
 
-	/* Flag every event that they are now enabled. */
+	/* Disable every event. */
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
 			node.node) {
@@ -651,14 +651,15 @@ int event_agent_disable_all(struct ltt_ust_session *usess,
 
 		ret = event_agent_disable(usess, agt, aevent->name);
 		if (ret != LTTNG_OK) {
-			rcu_read_unlock();
-			goto error;
+			goto error_unlock;
 		}
 	}
 	rcu_read_unlock();
 
 	ret = LTTNG_OK;
 
+error_unlock:
+	rcu_read_unlock();
 error:
 	return ret;
 }