X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=lttng-context.c;h=869496d8ce0f222925afd2b4535ba15b2168ec87;hp=406f479de92994217b2c1e5c480086752b173e27;hb=1aca53e11bbd4a28fb88f8466744abf66447c92f;hpb=d0e59d6f099f4663cc62bffb59d960cd4235064f

diff --git a/lttng-context.c b/lttng-context.c
index 406f479d..869496d8 100644
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context.c
  *
  * LTTng trace/channel/event context management.
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
@@ -95,12 +82,12 @@ struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
 		struct lttng_ctx_field *new_fields;
 
 		ctx->allocated_fields = max_t(size_t, 1, 2 * ctx->allocated_fields);
-		new_fields = kzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
+		new_fields = lttng_kvzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
 		if (!new_fields)
 			return NULL;
 		if (ctx->fields)
 			memcpy(new_fields, ctx->fields, sizeof(*ctx->fields) * ctx->nr_fields);
-		kfree(ctx->fields);
+		lttng_kvfree(ctx->fields);
 		ctx->fields = new_fields;
 	}
 	field = &ctx->fields[ctx->nr_fields];
@@ -128,6 +115,7 @@ void lttng_context_update(struct lttng_ctx *ctx)
 			field_align = type->u.basic.integer.alignment;
 			break;
 		case atype_array:
+		case atype_array_bitfield:
 		{
 			struct lttng_basic_type *btype;
 
@@ -141,6 +129,8 @@ void lttng_context_update(struct lttng_ctx *ctx)
 
 			case atype_array:
 			case atype_sequence:
+			case atype_array_bitfield:
+			case atype_sequence_bitfield:
 			case atype_struct:
 			case atype_array_compound:
 			case atype_sequence_compound:
@@ -152,6 +142,7 @@ void lttng_context_update(struct lttng_ctx *ctx)
 			break;
 		}
 		case atype_sequence:
+		case atype_sequence_bitfield:
 		{
 			struct lttng_basic_type *btype;
 
@@ -164,6 +155,8 @@ void lttng_context_update(struct lttng_ctx *ctx)
 			case atype_string:
 			case atype_array:
 			case atype_sequence:
+			case atype_array_bitfield:
+			case atype_sequence_bitfield:
 			case atype_struct:
 			case atype_array_compound:
 			case atype_sequence_compound:
@@ -186,6 +179,8 @@ void lttng_context_update(struct lttng_ctx *ctx)
 
 			case atype_array:
 			case atype_sequence:
+			case atype_array_bitfield:
+			case atype_sequence_bitfield:
 			case atype_struct:
 			case atype_array_compound:
 			case atype_sequence_compound:
@@ -240,7 +235,7 @@ void lttng_destroy_context(struct lttng_ctx *ctx)
 		if (ctx->fields[i].destroy)
 			ctx->fields[i].destroy(&ctx->fields[i]);
 	}
-	kfree(ctx->fields);
+	lttng_kvfree(ctx->fields);
 	kfree(ctx);
 }