See upstream commit, backported in v5.10.137 :
commit
1cb3032406423b25aa984854b4d78e0100d292dd
Author: Christoph Hellwig <hch@lst.de>
Date: Thu Dec 3 17:21:39 2020 +0100
block: remove the request_queue to argument request based tracepoints
[ Upstream commit
a54895fa057c67700270777f7661d8d3c7fda88a ]
The request_queue can trivially be derived from the request.
Change-Id: I01f96a437641421faf993b4b031171c372bd0374
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
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))
/**
* 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
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_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request *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))
/**
* 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
-#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_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
-#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
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))
/**
* 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