From: Peter Lieven <pl@kamp.de>
Date: Wed, 29 Jan 2014 12:03:35 +0000 (+0100)
Subject: block/iscsi: always fill bs->bl.opt_transfer_length
X-Git-Tag: v2.0.0-rc0~93^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d259fc7da83249a4f78fe32de2bc2874a997a9f;p=thirdparty%2Fqemu.git

block/iscsi: always fill bs->bl.opt_transfer_length

the opt_transfer_length has nothing to do with logical
block provisioning stuff so always copy it from
the block limits VPD page.

Reported-By: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/iscsi.c b/block/iscsi.c
index 6f4af72a753..8d0f9667c50 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1330,10 +1330,9 @@ static int iscsi_refresh_limits(BlockDriverState *bs)
         }
         bs->bl.write_zeroes_alignment = sector_lun2qemu(iscsilun->bl.opt_unmap_gran,
                                                         iscsilun);
-
-        bs->bl.opt_transfer_length = sector_lun2qemu(iscsilun->bl.opt_xfer_len,
-                                                     iscsilun);
     }
+    bs->bl.opt_transfer_length = sector_lun2qemu(iscsilun->bl.opt_xfer_len,
+                                                 iscsilun);
     return 0;
 }