From: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
Date: Wed, 12 Jun 2019 06:14:46 +0000 (+0800)
Subject: dm log writes: use struct_size() to calculate size of pending_block
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d4e6e83651777224c0259e01dde5eb078f9e6b1d;p=openwrt%2Fstaging%2Fblogic.git

dm log writes: use struct_size() to calculate size of pending_block

Use struct_size() to avoid open-coded equivalent that is prone to a type
mistake.

Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---

diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c
index e549392e0ea5..0837b17e1798 100644
--- a/drivers/md/dm-log-writes.c
+++ b/drivers/md/dm-log-writes.c
@@ -699,7 +699,7 @@ static int log_writes_map(struct dm_target *ti, struct bio *bio)
 	if (discard_bio)
 		alloc_size = sizeof(struct pending_block);
 	else
-		alloc_size = sizeof(struct pending_block) + sizeof(struct bio_vec) * bio_segments(bio);
+		alloc_size = struct_size(block, vecs, bio_segments(bio));
 
 	block = kzalloc(alloc_size, GFP_NOIO);
 	if (!block) {