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