[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 04/10] block: Use bdrv_nb_sectors() in bdrv_align
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v5 04/10] block: Use bdrv_nb_sectors() in bdrv_aligned_preadv() |
Date: |
Thu, 26 Jun 2014 13:23:19 +0200 |
Instead of bdrv_getlength(). Eliminate variable len.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
block.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 51dc65e..a6b620d 100644
--- a/block.c
+++ b/block.c
@@ -3050,15 +3050,14 @@ static int coroutine_fn
bdrv_aligned_preadv(BlockDriverState *bs,
ret = drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov);
} else {
/* Read zeros after EOF of growable BDSes */
- int64_t len, total_sectors, max_nb_sectors;
+ int64_t total_sectors, max_nb_sectors;
- len = bdrv_getlength(bs);
- if (len < 0) {
- ret = len;
+ total_sectors = bdrv_nb_sectors(bs);
+ if (total_sectors < 0) {
+ ret = total_sectors;
goto out;
}
- total_sectors = DIV_ROUND_UP(len, BDRV_SECTOR_SIZE);
max_nb_sectors = ROUND_UP(MAX(0, total_sectors - sector_num),
align >> BDRV_SECTOR_BITS);
if (max_nb_sectors > 0) {
--
1.9.3
- [Qemu-devel] [PATCH v5 00/10] Clean up around bdrv_getlength(), Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 04/10] block: Use bdrv_nb_sectors() in bdrv_aligned_preadv(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v5 03/10] block: Use bdrv_nb_sectors() in bdrv_make_zero(), Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 02/10] block: New bdrv_nb_sectors(), Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 07/10] block: Use bdrv_nb_sectors() where sectors, not bytes are wanted, Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 10/10] block: Avoid bdrv_get_geometry() where errors should be detected, Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 05/10] block: Use bdrv_nb_sectors() in bdrv_co_get_block_status(), Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 08/10] block: Drop superfluous aligning of bdrv_getlength()'s value, Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 06/10] block: Use bdrv_nb_sectors() in img_convert(), Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 09/10] qemu-img: Make img_convert() get image size just once per image, Markus Armbruster, 2014/06/26
- [Qemu-devel] [PATCH v5 01/10] raw-posix: Fix raw_getlength() to always return -errno on error, Markus Armbruster, 2014/06/26