X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=block%2Fbio-integrity.c;h=4db620849515f7c42843e4825a89918687becd28;hb=2454fcea338ad821a39d471bc7db5a58ba41b742;hp=42536674020a2daf58681638762cad3255f6d677;hpb=e0654264c4806dc436b291294a0fbf9be7571ab6;p=sfrench%2Fcifs-2.6.git

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 42536674020a..4db620849515 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -43,8 +43,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
 	unsigned inline_vecs;
 
 	if (!bs || !mempool_initialized(&bs->bio_integrity_pool)) {
-		bip = kmalloc(sizeof(struct bio_integrity_payload) +
-			      sizeof(struct bio_vec) * nr_vecs, gfp_mask);
+		bip = kmalloc(struct_size(bip, bip_inline_vecs, nr_vecs), gfp_mask);
 		inline_vecs = nr_vecs;
 	} else {
 		bip = mempool_alloc(&bs->bio_integrity_pool, gfp_mask);