From patchwork Tue Jun 22 14:09:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [03/14] block: fix physical_block_size calculation Date: Tue, 22 Jun 2010 04:09:22 -0000 From: Kevin Wolf X-Patchwork-Id: 56508 Message-Id: <1277215773-27357-4-git-send-email-kwolf@redhat.com> To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Christoph Hellwig Both SCSI and virtio expect the physical block size relative to the logical block size. So get the factor first before calculating the log2. Reported-by: Mike Cao Signed-off-by: Christoph Hellwig Signed-off-by: Kevin Wolf --- block_int.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/block_int.h b/block_int.h index e3bfd19..b64a009 100644 --- a/block_int.h +++ b/block_int.h @@ -224,7 +224,9 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) { unsigned int exp = 0, size; - for (size = conf->physical_block_size; size > 512; size >>= 1) { + for (size = conf->physical_block_size; + size > conf->logical_block_size; + size >>= 1) { exp++; }