From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kiZgd-0005Mh-Qo for mharc-grub-devel@gnu.org; Fri, 27 Nov 2020 04:05:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiZgc-0005JH-D2 for grub-devel@gnu.org; Fri, 27 Nov 2020 04:05:02 -0500 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]:37814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiZga-0005b0-NU for grub-devel@gnu.org; Fri, 27 Nov 2020 04:05:02 -0500 Received: by mail-lj1-x242.google.com with SMTP id z1so5136980ljn.4 for ; Fri, 27 Nov 2020 01:05:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8eIy/X8FEHV1cOrB7HFLt1XCPU34z2sGj4uDbTYgxmQ=; b=zkhOR7FCBDLizV25j3i511opxBt9wmnNPHplPhJ6QcDzQz04rE5sitxJXLE3z7T4kK 4DlXEv+YFLnVz3QvVL1cHJWY3kO+pVUP4VQWLB/Q9ODJL9V6YpIncitRC84EeiB0IxcS 44ZT4I88FWV7qkOjs9aA3xOww/Ov1KqnSFdyeLCcGngD5/vfqCjfkzeUcWMxch2k+Uqf rfMM5UfTPIADnJQv0R7GOXeVJ3EOrb681Cmqxy133798WS7jVMwQc5uG/wx8y4vd1fOK LyjUXcMEE9SpJlJYeXpo3KZ2L0Md3rvdel0ZBisBH+Di8X5yiENAtcCgyfnnnm7F9FTk R0sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8eIy/X8FEHV1cOrB7HFLt1XCPU34z2sGj4uDbTYgxmQ=; b=mDoujoavYeF1gJJCJtg9IvotGdJ7F3cFIEKdAAXNyzbMEcyVa2hQ4wSkuB/qn/p6m4 TC8JlzT+Vt0Hj2kg+rGs3wBP2v2b1ziA27w3bQ+CHjbviNlE8UNDUoSdwzybk4W6URuv VCL5hsqbx/Yg+Zm8OCL0ziqeV3BenuZ5o1G26gqZyEai04QbX6tCZdtVRZRJsrPboPHn HBARcwT98r8iEysNX9WYDq5dyFihPomfXoOD+naYMlbq1tx5mW8nv5rYYqOtqOSjPlQg P/qRpI4EkXag1tmz56FQicv/LYqaE+RjCk8+hDYsCbSUIaqOOAd1rCVwYaOtH09nfduk knHQ== X-Gm-Message-State: AOAM53164KSsgYZ0f2CYveVnjCdzzc2Y/bekc3cWNjkeUWzAP3Sl4d/Z +NTd8aT+iq2N8O7aiT1frFF0MTqGtwLkYw== X-Google-Smtp-Source: ABdhPJzSgJkPXZTnCUsx0DI0xd0ZRwEeCHkNB62AvWJ2/d3NuXYDGLN0rOQonzryQO36qhhMOpWQUA== X-Received: by 2002:a2e:2a01:: with SMTP id q1mr3018803ljq.167.1606467898767; Fri, 27 Nov 2020 01:04:58 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id g2sm880675lja.87.2020.11.27.01.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 01:04:58 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v6 12/12] luks2: Use grub_log2ull to calculate log_sector_size and improve readability Date: Fri, 27 Nov 2020 03:03:44 -0600 Message-Id: <7050a4ace69fdfd72e762233b4ec717c9cb28ff9.1606467382.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::242; envelope-from=development@efficientek.com; helo=mail-lj1-x242.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Nov 2020 09:05:02 -0000 Signed-off-by: Glenn Washburn --- 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 c2129f929..173a14197 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -639,8 +639,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