fix: block: don't call blk_status_to_errno in blk_update_request (v5.16)

[lttng-modules.git] / src / lttng-bytecode-specialize.c

diff --git a/src/lttng-bytecode-specialize.c b/src/lttng-bytecode-specialize.c
index 5c57754893ecc6e80e0e1c488aa728782f08780a..f8b5f19dcdc5d1629a9a9977631446f3c28a6483 100644 (file)
--- a/src/lttng-bytecode-specialize.c
+++ b/src/lttng-bytecode-specialize.c
@@ -8,6 +8,8 @@
  */
 
 #include <linux/slab.h>
+#include <wrapper/compiler_attributes.h>
+
 #include <lttng/lttng-bytecode.h>
 #include <lttng/align.h>
 #include <lttng/events-internal.h>
@@ -271,7 +273,8 @@ static int specialize_get_index(struct bytecode_runtime *runtime,
                }
                case OBJECT_TYPE_STRUCT:
                        /* Only generated by the specialize phase. */
-               case OBJECT_TYPE_VARIANT:       /* Fall-through */
+               case OBJECT_TYPE_VARIANT:
+                       lttng_fallthrough;
                default:
                        printk(KERN_WARNING "LTTng: bytecode: Unexpected get index type %d",
                                (int) stack_top->load.object_type);
@@ -454,11 +457,11 @@ static int specialize_payload_lookup(const struct lttng_kernel_event_desc *event
        struct bytecode_get_index_data gid;
        ssize_t data_offset;
 
-       nr_fields = event_desc->nr_fields;
+       nr_fields = event_desc->tp_class->nr_fields;
        offset = ((struct get_symbol *) insn->data)->offset;
        name = runtime->p.bc->bc.data + runtime->p.bc->bc.reloc_offset + offset;
        for (i = 0; i < nr_fields; i++) {
-               field = event_desc->fields[i];
+               field = event_desc->tp_class->fields[i];
                if (field->nofilter) {
                        continue;
                }