X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter.c;h=ec6fd576097af828dbe3dfa064691ca3545119b4;hb=79282ffdd4f0ad1237f99dcc1f0b36f81d797452;hp=05ce683ee72121a659cf620dcca2c3dcefb593c2;hpb=6423140ffcb1c5b005199bb2fa34621361ad538d;p=lttng-modules.git

diff --git a/lttng-filter.c b/lttng-filter.c
index 05ce683e..ec6fd576 100644
--- a/lttng-filter.c
+++ b/lttng-filter.c
@@ -246,7 +246,7 @@ int apply_field_reloc(struct lttng_event *event,
 
 			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			if (field->user)
+			if (elem_type->u.basic.integer.user)
 				op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
 			else
 				op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
@@ -258,14 +258,14 @@ int apply_field_reloc(struct lttng_event *event,
 
 			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			if (field->user)
+			if (elem_type->u.basic.integer.user)
 				op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
 			else
 				op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
 			break;
 		}
 		case atype_string:
-			if (field->user)
+			if (field->type.u.basic.string.user)
 				op->op = FILTER_OP_LOAD_FIELD_REF_USER_STRING;
 			else
 				op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
@@ -334,7 +334,7 @@ int apply_context_reloc(struct lttng_event *event,
 
 			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			BUG_ON(ctx_field->event_field.user);
+			BUG_ON(elem_type->u.basic.integer.user);
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		}
@@ -344,12 +344,12 @@ int apply_context_reloc(struct lttng_event *event,
 
 			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			BUG_ON(ctx_field->event_field.user);
+			BUG_ON(elem_type->u.basic.integer.user);
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		}
 		case atype_string:
-			BUG_ON(ctx_field->event_field.user);
+			BUG_ON(ctx_field->event_field.type.u.basic.string.user);
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		case atype_struct:	/* Unsupported. */