[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 17/17] luks2: Use grub_log2ull to calculate log_sector_size an
From: |
Glenn Washburn |
Subject: |
[PATCH v7 17/17] luks2: Use grub_log2ull to calculate log_sector_size and improve readability |
Date: |
Fri, 4 Dec 2020 10:43:46 -0600 |
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
grub-core/disk/luks2.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
index 2335ded77..4fa5a0dbc 100644
--- a/grub-core/disk/luks2.c
+++ b/grub-core/disk/luks2.c
@@ -642,8 +642,7 @@ luks2_recover_key (grub_disk_t source,
/* Set up disk according to keyslot's segment. */
crypt->offset_sectors = grub_divmod64 (segment.offset,
segment.sector_size, NULL);
- crypt->log_sector_size = sizeof (unsigned int) * 8
- - __builtin_clz ((unsigned int) segment.sector_size) - 1;
+ crypt->log_sector_size = grub_log2ull (segment.sector_size);
/* Set to the source disk size, which is the maximum we allow. */
max_crypt_sectors = grub_disk_convert_sector(source,
source->total_sectors,
--
2.27.0