From: Michael Jeanson <mjeanson@efficios.com>

Date: Sun Jan 23 13:11:47 2022 -0500

Git-commit: 4b1945d3c055de4b49e310f799e6f92c57546349

Signed-off-by: Tony Jones <tonyj@suse.de>

​

    fix: block: remove the ->rq_disk field in struct request (v5.17)

​

    SUSE: Adjust this commit to reflect SLE15-SP5 backport

​

--- a/include/instrumentation/events/block.h

+++ b/include/instrumentation/events/block.h

@@ -342,7 +342,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq

 )

 #endif

-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))

+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) || defined(CONFIG_SUSE_KERNEL))

 /**

  * block_rq_requeue - place block IO request back on a queue

  * @rq: block IO operation request

@@ -437,7 +437,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq

  * do for the request. If @rq->bio is non-NULL then there is

  * additional work required to complete the request.

  */

-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))

+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) || defined(CONFIG_SUSE_KERNEL))

 LTTNG_TRACEPOINT_EVENT(block_rq_complete,

    TP_PROTO(struct request *rq, blk_status_t error, unsigned int nr_bytes),

@@ -593,7 +593,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq

 #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0)) */

-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))

+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) || defined(CONFIG_SUSE_KERNEL))

 LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,

    TP_PROTO(struct request *rq),

@@ -1610,7 +1610,7 @@ LTTNG_TRACEPOINT_EVENT(block_bio_remap,

 )

 #endif

-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))

+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) || defined(CONFIG_SUSE_KERNEL))

 /**

  * block_rq_remap - map request for a block operation request

  * @rq: block IO operation request

​