projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: Adjust ranges for RHEL 8.6 kernels
[lttng-modules.git]
/
include
/
instrumentation
/
events
/
block.h
diff --git
a/include/instrumentation/events/block.h
b/include/instrumentation/events/block.h
index 050a59a248f9e91fdaa5c3ca5cde76e8e836df2d..598d75a947aab08d2aa082b6bb4835a5d1eb5913 100644
(file)
--- a/
include/instrumentation/events/block.h
+++ b/
include/instrumentation/events/block.h
@@
-11,9
+11,9
@@
#include <linux/trace_seq.h>
#include <lttng/kernel-version.h>
#include <linux/trace_seq.h>
#include <lttng/kernel-version.h>
-#if
(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)
)
+#if
LTTNG_KERNEL_RANGE(4,11,0, 5,18,0
)
#include <scsi/scsi_request.h>
#include <scsi/scsi_request.h>
-#endif /*
(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)
) */
+#endif /*
LTTNG_KERNEL_RANGE(4,11,0, 5,18,0
) */
#ifndef _TRACE_BLOCK_DEF_
#define _TRACE_BLOCK_DEF_
#ifndef _TRACE_BLOCK_DEF_
#define _TRACE_BLOCK_DEF_
@@
-366,7
+366,9
@@
LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
)
)
lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
)
)
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
/**
* block_rq_requeue - place block IO request back on a queue
* @rq: block IO operation request
/**
* block_rq_requeue - place block IO request back on a queue
* @rq: block IO operation request
@@
-611,7
+613,9
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request *rq),
@@
-746,7
+750,9
@@
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
)
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */
)
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
/**
* block_rq_insert - insert block operation request into queue
* @rq: block IO operation request
/**
* block_rq_insert - insert block operation request into queue
* @rq: block IO operation request
@@
-781,7
+787,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert,
)
#endif
)
#endif
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
/**
* block_rq_issue - issue pending block IO request operation to device driver
* @rq: block IO operation operation request
/**
* block_rq_issue - issue pending block IO request operation to device driver
* @rq: block IO operation operation request
@@
-812,7
+820,8
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue,
)
#endif
)
#endif
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
/**
* block_rq_merge - merge request with another one in the elevator
* @rq: block IO operation operation request
/**
* block_rq_merge - merge request with another one in the elevator
* @rq: block IO operation operation request
@@
-1632,7
+1641,9
@@
LTTNG_TRACEPOINT_EVENT(block_rq_remap,
lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
)
)
lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
)
)
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
/**
* block_rq_remap - map request for a block operation request
* @rq: block IO operation request
/**
* block_rq_remap - map request for a block operation request
* @rq: block IO operation request
This page took
0.024014 seconds
and
4
git commands to generate.