From f6d290fd57a197ba0208db20b28a1dfa27ecbcba Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 12 Apr 2023 09:24:39 -0700 Subject: [PATCH] ANDROID: block: Prepare for preserving the zoned write order This patch does not change any functionality. This patch is a subset of the following patch that is expected to be merged upstream soon: https://lore.kernel.org/linux-block/20230407235822.1672286-3-bvanassche@acm.org/ Bug: 275581839 Bug: 277112517 Change-Id: I717d1c78233b92fd18297c81ef15335684da5d54 Signed-off-by: Bart Van Assche --- include/linux/blkdev.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5ec1f14f78cc..3fd1e6f65a64 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -162,23 +162,19 @@ struct request { }; /* - * Three pointers are available for the IO schedulers, if they need - * more they have to dynamically allocate it. Flush requests are - * never put on the IO scheduler. So let the flush fields share - * space with the elevator data. + * Three pointers are available for IO schedulers. If they need + * more private data they have to allocate it dynamically. */ - union { - struct { - struct io_cq *icq; - void *priv[2]; - } elv; + struct { + struct io_cq *icq; + void *priv[2]; + } elv; - struct { - unsigned int seq; - struct list_head list; - rq_end_io_fn *saved_end_io; - } flush; - }; + struct { + unsigned int seq; + struct list_head list; + rq_end_io_fn *saved_end_io; + } flush; struct gendisk *rq_disk; struct block_device *part;