1 From 2bc7cb7193124d20aa4e1b5dbad0410bfb97a470 Mon Sep 17 00:00:00 2001
2 From: Michael Jeanson <mjeanson@efficios.com>
3 Date: Mon, 4 Apr 2022 14:12:13 -0400
4 Subject: [PATCH 05/13] fix: scsi: block: Remove REQ_OP_WRITE_SAME support
9 commit 73bd66d9c834220579c881a3eb020fd8917075d8
10 Author: Christoph Hellwig <hch@lst.de>
11 Date: Wed Feb 9 09:28:28 2022 +0100
13 scsi: block: Remove REQ_OP_WRITE_SAME support
15 No more users of REQ_OP_WRITE_SAME or drivers implementing it are left,
16 so remove the infrastructure.
18 Change-Id: Ifbff71f79f8b590436fc7cb79f82d90c6e033d84
19 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
20 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
22 include/instrumentation/events/block.h | 32 ++++++++++++++++++++++++++
23 1 file changed, 32 insertions(+)
25 diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h
26 index 3e1104d7..050a59a2 100644
27 --- a/include/instrumentation/events/block.h
28 +++ b/include/instrumentation/events/block.h
29 @@ -66,6 +66,37 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type,
30 #define lttng_bio_op(bio) bio_op(bio)
31 #define lttng_bio_rw(bio) ((bio)->bi_opf)
33 +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
34 +#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
35 +#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \
36 + ctf_enum(block_rq_type, type, rwbs, \
37 + ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \
38 + ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \
39 + ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \
40 + ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \
41 + ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \
43 + | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \
44 + | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \
45 + | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \
46 + | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
47 + | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
49 +#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \
50 + ctf_integer(type, rwbs, \
51 + ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \
52 + ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \
53 + ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \
54 + ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \
55 + ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \
57 + | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \
58 + | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \
59 + | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \
60 + | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
61 + | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
62 +#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
64 #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
65 #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \
66 ctf_enum(block_rq_type, type, rwbs, \
67 @@ -95,6 +126,7 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type,
68 | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
69 | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
70 #endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
73 #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0))