summaryrefslogtreecommitdiff
path: root/block/qed-check.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-04-24 18:38:58 +0100
committerKevin Wolf <kwolf@redhat.com>2011-04-27 16:21:00 +0200
commit19dfc44a94f759848a0f7de7378b2f8b9af6b5d0 (patch)
tree35d5bdf0ba785bb6dd31bdd01992da7dea6411d2 /block/qed-check.c
parent7a2c4b82340d621bff462672b29c88d2020d68c1 (diff)
qed: Fix consistency check on 32-bit hosts
The qed_bytes_to_clusters() function is normally used with size_t lengths. Consistency check used it with file size length and therefore failed on 32-bit hosts when the image file is 4 GB or more. Make qed_bytes_to_clusters() explicitly 64-bit and update consistency check to keep 64-bit cluster counts. Reported-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qed-check.c')
-rw-r--r--block/qed-check.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/qed-check.c b/block/qed-check.c
index ea4ebc8e20..22cd07fa1f 100644
--- a/block/qed-check.c
+++ b/block/qed-check.c
@@ -18,7 +18,7 @@ typedef struct {
BdrvCheckResult *result;
bool fix; /* whether to fix invalid offsets */
- size_t nclusters;
+ uint64_t nclusters;
uint32_t *used_clusters; /* referenced cluster bitmap */
QEDRequest request;
@@ -177,7 +177,7 @@ static int qed_check_l1_table(QEDCheck *check, QEDTable *table)
static void qed_check_for_leaks(QEDCheck *check)
{
BDRVQEDState *s = check->s;
- size_t i;
+ uint64_t i;
for (i = s->header.header_size; i < check->nclusters; i++) {
if (!qed_test_bit(check->used_clusters, i)) {