0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch

   1 From e8d2f286b5b208ac8870d0a9c167b170e96169b3 Mon Sep 17 00:00:00 2001
   2 From: Michael Jeanson <mjeanson@efficios.com>
   3 Date: Mon, 4 Apr 2022 15:08:48 -0400
   4 Subject: [PATCH 08/13] fix: scsi: core: Remove <scsi/scsi_request.h> (v5.18)
   5
   6 See upstream commit :
   7
   8   commit 26440303310591e29121964ede0048583cb3126d
   9   Author: Christoph Hellwig <hch@lst.de>
  10   Date:   Thu Feb 24 18:55:52 2022 +0100
  11
  12     scsi: core: Remove <scsi/scsi_request.h>
  13
  14     This header is empty now except for an include of <linux/blk-mq.h>, so
  15     remove it.
  16
  17 Change-Id: Ic8ee3352f1e8bddfcd44c31be9b788db82f183aa
  18 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
  19 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  20 ---
  21  include/instrumentation/events/block.h | 4 ++--
  22  1 file changed, 2 insertions(+), 2 deletions(-)
  23
  24 diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h
  25 index 050a59a2..882e6e08 100644
  26 --- a/include/instrumentation/events/block.h
  27 +++ b/include/instrumentation/events/block.h
  28 @@ -11,9 +11,9 @@
  29  #include <linux/trace_seq.h>
  30  #include <lttng/kernel-version.h>
  31
  32 -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0))
  33 +#if LTTNG_KERNEL_RANGE(4,11,0, 5,18,0)
  34  #include <scsi/scsi_request.h>
  35 -#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */
  36 +#endif /* LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) */
  37
  38  #ifndef _TRACE_BLOCK_DEF_
  39  #define _TRACE_BLOCK_DEF_
  40 --
  41 2.36.1
  42