block/io: Merge discard request alignments

akihikodaki · stefanhaRH · commit 9f460c64e138 · 2021-07-06T14:28:55.000+01:00
Signed-off-by: Akihiko Odaki &lt;akihiko.odaki@gmail.com&gt;
Message-id: 20210705130458.97642-3-akihiko.odaki@gmail.com
Signed-off-by: Stefan Hajnoczi &lt;stefanha@redhat.com&gt;
diff --git a/block/io.c b/block/io.c
@@ -125,6 +125,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->max_hw_transfer = MIN_NON_ZERO(dst->max_hw_transfer,

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)`
`125`	`125`
`126`	`126`	`static void bdrv_merge_limits(BlockLimits dst, const BlockLimits src)`
`127`	`127`	`{`
	`128`	`+ dst->pdiscard_alignment = MAX(dst->pdiscard_alignment,`
	`129`	`+ src->pdiscard_alignment);`
`128`	`130`	`dst->opt_transfer = MAX(dst->opt_transfer, src->opt_transfer);`
`129`	`131`	`dst->max_transfer = MIN_NON_ZERO(dst->max_transfer, src->max_transfer);`
`130`	`132`	`dst->max_hw_transfer = MIN_NON_ZERO(dst->max_hw_transfer,`