[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 06/16] crypto: Use DIV_ROUND_UP
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PATCH 06/16] crypto: Use DIV_ROUND_UP |
Date: |
Tue, 31 May 2016 18:35:55 +0200 |
Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d).
This patch is the result of coccinelle script
scripts/coccinelle/round.cocci
CC: Daniel P. Berrange <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
crypto/block-luks.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index 17c4300..63649f1 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -1081,8 +1081,7 @@ qcrypto_block_luks_create(QCryptoBlock *block,
luks->header.key_slots[i].key_offset =
(QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET /
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE) +
- (ROUND_UP(((splitkeylen + (QCRYPTO_BLOCK_LUKS_SECTOR_SIZE - 1)) /
- QCRYPTO_BLOCK_LUKS_SECTOR_SIZE),
+ (ROUND_UP(DIV_ROUND_UP(splitkeylen,
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE),
(QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET /
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)) * i);
}
@@ -1182,8 +1181,7 @@ qcrypto_block_luks_create(QCryptoBlock *block,
luks->header.payload_offset =
(QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET /
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE) +
- (ROUND_UP(((splitkeylen + (QCRYPTO_BLOCK_LUKS_SECTOR_SIZE - 1)) /
- QCRYPTO_BLOCK_LUKS_SECTOR_SIZE),
+ (ROUND_UP(DIV_ROUND_UP(splitkeylen, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE),
(QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET /
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)) *
QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS);
--
2.5.5
- [Qemu-trivial] [PATCH 00/16] use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)), Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 01/16] coccinelle: use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)), Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 02/16] parallels: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 03/16] qcow/qcow2: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 07/16] xen: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 06/16] crypto: Use DIV_ROUND_UP,
Laurent Vivier <=
- [Qemu-trivial] [PATCH 05/16] block: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 04/16] qed: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 08/16] audio: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 09/16] SPICE: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 10/16] rocker: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31
- [Qemu-trivial] [PATCH 12/16] slirp: Use DIV_ROUND_UP, Laurent Vivier, 2016/05/31