From: Michael Jeanson <mjeanson@efficios.com>

Date: Mon Apr 4 14:12:13 2022 -0400

Git-commit: aaf6547b534309da88219031ceab0c105f5bf1e5

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

​

   fix: scsi: block: Remove REQ_OP_WRITE_SAME support (v5.18)

​

   SUSE: Adjust this commit to reflect SLE15-SP5 backport

​

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

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

@@ -66,7 +66,7 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type,

 #define lttng_bio_op(bio)  bio_op(bio)

 #define lttng_bio_rw(bio)  ((bio)->bi_opf)

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

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

 #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM

 #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes)                  \

        ctf_enum(block_rq_type, type, rwbs,                       \

​