[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 42/52] crypto: Use DIV_ROUND_UP
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 42/52] crypto: Use DIV_ROUND_UP |
Date: |
Sun, 5 Jun 2016 10:43:19 +0300 |
From: Laurent Vivier <address@hidden>
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>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Michael Tokarev <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.1.4
- [Qemu-trivial] [PULL 20/52] qdev: Clean up around properties, (continued)
- [Qemu-trivial] [PULL 20/52] qdev: Clean up around properties, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 31/52] all: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 14/52] Fix linking relocatable objects on Sparc, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 25/52] Fix configure test for PBKDF2 in nettle, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 07/52] po/Makefile: call rm -f directly, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 24/52] docs: Fix a couple of typos in throttle.txt, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 36/52] thunk: Rename args and fields in host-target bitmask conversion code, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 42/52] crypto: Use DIV_ROUND_UP,
Michael Tokarev <=
- [Qemu-trivial] [PULL 50/52] pc-bios/s390-ccw: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 29/52] tests: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 52/52] hbitmap: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 13/52] ppc: Remove a potential overflow in muldiv64(), Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 43/52] xen: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 30/52] qga: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 23/52] hw: Clean up includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 04/52] qga: spelling fix, Michael Tokarev, 2016/06/05