[v4 3/3] block/io: Merge discard request alignments

From: Akihiko Odaki <akihiko.odaki@gmail.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <fam@euphon.net>,
	pkrempa@redhat.com, Akihiko Odaki <akihiko.odaki@gmail.com>,
	qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Konstantin Nazarov <mail@knazarov.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	John Snow <jsnow@redhat.com>,
	dgilbert@redhat.com
Subject: [v4 3/3] block/io: Merge discard request alignments
Date: Sat,  3 Apr 2021 00:54:06 +0900	[thread overview]
Message-ID: <20210402155406.31033-3-akihiko.odaki@gmail.com> (raw)
In-Reply-To: <20210402155406.31033-1-akihiko.odaki@gmail.com>

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
 block/io.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/io.c b/block/io.c
index ca2dca30070..aad74bd6714 100644
--- a/block/io.c
+++ b/block/io.c
@@ -124,6 +124,8 @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)
 
 static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
 {
+    dst->pdiscard_alignment = MAX(dst->pdiscard_alignment,
+                                  src->pdiscard_alignment);
     dst->opt_transfer = MAX(dst->opt_transfer, src->opt_transfer);
     dst->max_transfer = MIN_NON_ZERO(dst->max_transfer, src->max_transfer);
     dst->opt_mem_alignment = MAX(dst->opt_mem_alignment,
-- 
2.24.3 (Apple Git-128)


