From 091b1108ca6d6e3bfaea5f095f219bf5ea8c316b Mon Sep 17 00:00:00 2001 From: Charlie Shepherd Date: Fri, 15 Nov 2013 19:47:02 +0100 Subject: [PATCH] COW: Extend checking allocated bits to beyond one sector cow_co_is_allocated() only checks one sector's worth of allocated bits before returning. This is allowed but (slightly) inefficient, so extend it to check all of the file's metadata sectors. Signed-off-by: Charlie Shepherd Reviewed-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi [kwolf: silenced compiler warning (-Wmaybe-uninitialized for changed)] Signed-off-by: Kevin Wolf --- block/cow.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/block/cow.c b/block/cow.c index f75949607c..dc15e46b6c 100644 --- a/block/cow.c +++ b/block/cow.c @@ -152,18 +152,34 @@ static int coroutine_fn cow_co_is_allocated(BlockDriverState *bs, { int64_t bitnum = sector_num + sizeof(struct cow_header_v2) * 8; uint64_t offset = (bitnum / 8) & -BDRV_SECTOR_SIZE; - uint8_t bitmap[BDRV_SECTOR_SIZE]; - int ret; - int changed; + bool first = true; + int changed = 0, same = 0; - ret = bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap)); - if (ret < 0) { - return ret; - } + do { + int ret; + uint8_t bitmap[BDRV_SECTOR_SIZE]; - bitnum &= BITS_PER_BITMAP_SECTOR - 1; - changed = cow_test_bit(bitnum, bitmap); - *num_same = cow_find_streak(bitmap, changed, bitnum, nb_sectors); + bitnum &= BITS_PER_BITMAP_SECTOR - 1; + int sector_bits = MIN(nb_sectors, BITS_PER_BITMAP_SECTOR - bitnum); + + ret = bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap)); + if (ret < 0) { + return ret; + } + + if (first) { + changed = cow_test_bit(bitnum, bitmap); + first = false; + } + + same += cow_find_streak(bitmap, changed, bitnum, nb_sectors); + + bitnum += sector_bits; + nb_sectors -= sector_bits; + offset += BDRV_SECTOR_SIZE; + } while (nb_sectors); + + *num_same = same; return changed; }