From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Nicholas A. Bellinger" Subject: [PATCH 2/2] [block]: Skip refresh_total_sectors() for scsi-generic devices Date: Sat, 15 May 2010 06:30:59 -0700 Message-ID: <1273930259-12694-1-git-send-email-nab@linux-iscsi.org> Cc: Nicholas Bellinger To: Kevin Wolf , Christoph Hellwig , Gerd Hoffmann , Hannes Reinecke , kvm-devel , qemu-devel Received: from smtp128.sbc.mail.sp1.yahoo.com ([69.147.65.187]:26893 "HELO smtp128.sbc.mail.sp1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751281Ab0EOFHl (ORCPT ); Sat, 15 May 2010 01:07:41 -0400 Sender: kvm-owner@vger.kernel.org List-ID: From: Nicholas Bellinger This patch adds a BlockDriverState->sg check in block.c:bdrv_common_open() to skip the new refresh_total_sectors() call once we know we are working with a scsi-generic device. We go ahead and skip this call for scsi-generic devices because block/raw-posix.c:raw_getlength() -> lseek() will return -ESPIPE. Signed-off-by: Nicholas A. Bellinger --- block.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 02a22f6..1053161 100644 --- a/block.c +++ b/block.c @@ -444,10 +444,15 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, } bs->keep_read_only = bs->read_only = !(open_flags & BDRV_O_RDWR); - - ret = refresh_total_sectors(bs, bs->total_sectors); - if (ret < 0) { - goto free_and_fail; + /* + * For scsi-generic devices, do not call refresh_total_sectors() -> raw_getlength() + * because lseek() will return -ESPIPE. + */ + if (!(bs->sg)) { + ret = refresh_total_sectors(bs, bs->total_sectors); + if (ret < 0) { + goto free_and_fail; + } } #ifndef _WIN32 -- 1.5.6.5