Patchwork [PATCHv2,16/20] block/get_block_status: avoid redundant callouts on raw devices

login
register
mail settings
Submitter Peter Lieven
Date Sept. 17, 2013, 1:48 p.m.
Message ID <1379425736-11326-17-git-send-email-pl@kamp.de>
Download mbox | patch
Permalink /patch/275473/
State New
Headers show

Comments

Peter Lieven - Sept. 17, 2013, 1:48 p.m.
if a raw device like an iscsi target or host device is used
the current implementation makes a second call out to get
the block status of bs->file. however, the raw driver already
has called bdrv_get_block_status on bs->file.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Lieven <pl@kamp.de>
---
 block.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/block.c b/block.c
index 461a1d7..64fca1b 100644
--- a/block.c
+++ b/block.c
@@ -3206,7 +3206,8 @@  static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
 
     if (bs->file &&
         (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) &&
-        (ret & BDRV_BLOCK_OFFSET_VALID)) {
+        (ret & BDRV_BLOCK_OFFSET_VALID) &&
+        strcmp(bs->drv->format_name, "raw")) {
         ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,
                                         *pnum, pnum);
         if (ret2 >= 0) {