From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 26 Jan 2022 15:53:55 +0000 (-0500)
Subject: Fix: _lttng_variant_statedump should expect lttng_ust_ctl_atype_variant_nestable
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a13748e9cfc3a9544d7195bcb2037e212dcec829;p=lttng-tools.git

Fix: _lttng_variant_statedump should expect lttng_ust_ctl_atype_variant_nestable

The precondition check in _lttng_variant_statedump is too strict: it
should also expect lttng_ust_ctl_atype_variant_nestable. Remove this
check entirely, which is redundant with the switch/case in the only
caller sites in the same compile unit.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I744cc5cef69ff29f8d7ecc1cf01c9a629c6e222e
---

diff --git a/src/bin/lttng-sessiond/ust-metadata.cpp b/src/bin/lttng-sessiond/ust-metadata.cpp
index 6028527c5..7e6b1aba0 100644
--- a/src/bin/lttng-sessiond/ust-metadata.cpp
+++ b/src/bin/lttng-sessiond/ust-metadata.cpp
@@ -369,10 +369,6 @@ int _lttng_variant_statedump(struct ust_registry_session *session,
 	int ret;
 	char identifier[LTTNG_UST_ABI_SYM_NAME_LEN];
 
-	if (variant->type.atype != lttng_ust_ctl_atype_variant) {
-		ret = -EINVAL;
-		goto end;
-	}
 	(*iter_field)++;
 	sanitize_ctf_identifier(identifier, tag_name);
 	if (alignment) {