Patchwork [2/2,block] : Add SG_IO device check in refresh_total_sectors()

login
register
mail settings
Submitter Nicholas A. Bellinger
Date May 17, 2010, 4:46 p.m.
Message ID <1274114764-27975-1-git-send-email-nab@linux-iscsi.org>
Download mbox | patch
Permalink /patch/52752/
State New
Headers show

Comments

Nicholas A. Bellinger - May 17, 2010, 4:46 p.m.
From: Nicholas Bellinger <nab@linux-iscsi.org>

This patch adds a special case check for scsi-generic devices in refresh_total_sectors()
to skip the subsequent BlockDriver->bdrv_getlength() that will be returning
-ESPIPE from block/raw-posic.c:raw_getlength() for BlockDriverState->sg=1 devices.

Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
---
 block.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Patch

diff --git a/block.c b/block.c
index f419ee6..7917712 100644
--- a/block.c
+++ b/block.c
@@ -364,6 +364,10 @@  static int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
 {
     BlockDriver *drv = bs->drv;
 
+    /* Do not attempt drv->bdrv_getlength() on scsi-generic devices */
+    if (bs->sg)
+        return 0;
+
     /* query actual device if possible, otherwise just trust the hint */
     if (drv->bdrv_getlength) {
         int64_t length = drv->bdrv_getlength(bs);