Patchwork block/iscsi: reenable iscsi_co_get_block_status

login
register
mail settings
Submitter Peter Lieven
Date Oct. 2, 2013, 11:52 a.m.
Message ID <1380714728-3739-1-git-send-email-pl@kamp.de>
Download mbox | patch
Permalink /patch/279708/
State New
Headers show

Comments

Peter Lieven - Oct. 2, 2013, 11:52 a.m.
Commit f35c934a accidently disabled iscsi_co_get_block_status for all
libiscsi versions. Its not possible to check for enumeration constants
in the C preprocessor. This patch changes the check to the preprocessor
constant LIBISCSI_FEATURE_IOVECTOR which was introduced shortly after
get_lba_status support was added to libiscsi.

Signed-off-by: Peter Lieven <pl@kamp.de>
---
 block/iscsi.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Paolo Bonzini - Oct. 2, 2013, 11:58 a.m.
Il 02/10/2013 13:52, Peter Lieven ha scritto:
> Commit f35c934a accidently disabled iscsi_co_get_block_status for all
> libiscsi versions. Its not possible to check for enumeration constants
> in the C preprocessor. This patch changes the check to the preprocessor
> constant LIBISCSI_FEATURE_IOVECTOR which was introduced shortly after
> get_lba_status support was added to libiscsi.
> 
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block/iscsi.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 6152ef1..a2a961e 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -811,7 +811,7 @@ iscsi_getlength(BlockDriverState *bs)
>      return len;
>  }
>  
> -#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
> +#if defined(LIBISCSI_FEATURE_IOVECTOR)
>  
>  static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,
>                                                    int64_t sector_num,
> @@ -903,7 +903,7 @@ out:
>      return ret;
>  }
>  
> -#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */
> +#endif /* LIBISCSI_FEATURE_IOVECTOR */
>  
>  static int
>  coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num,
> @@ -1529,7 +1529,7 @@ static BlockDriver bdrv_iscsi = {
>      .bdrv_getlength  = iscsi_getlength,
>      .bdrv_truncate   = iscsi_truncate,
>  
> -#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
> +#if defined(LIBISCSI_FEATURE_IOVECTOR)
>      .bdrv_co_get_block_status = iscsi_co_get_block_status,
>  #endif
>      .bdrv_co_discard      = iscsi_co_discard,
> 

Oops.

Thanks,

Paolo
Stefan Weil - Oct. 2, 2013, 5:07 p.m.
Am 02.10.2013 13:52, schrieb Peter Lieven:
> Commit f35c934a accidently disabled iscsi_co_get_block_status for all
> libiscsi versions. Its not possible to check for enumeration constants
> in the C preprocessor. This patch changes the check to the preprocessor
> constant LIBISCSI_FEATURE_IOVECTOR which was introduced shortly after
> get_lba_status support was added to libiscsi.
>
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block/iscsi.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 6152ef1..a2a961e 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -811,7 +811,7 @@ iscsi_getlength(BlockDriverState *bs)
>      return len;
>  }
>  
> -#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
> +#if defined(LIBISCSI_FEATURE_IOVECTOR)
>  
>  static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,
>                                                    int64_t sector_num,
> @@ -903,7 +903,7 @@ out:
>      return ret;
>  }
>  
> -#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */
> +#endif /* LIBISCSI_FEATURE_IOVECTOR */
>  
>  static int
>  coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num,
> @@ -1529,7 +1529,7 @@ static BlockDriver bdrv_iscsi = {
>      .bdrv_getlength  = iscsi_getlength,
>      .bdrv_truncate   = iscsi_truncate,
>  
> -#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
> +#if defined(LIBISCSI_FEATURE_IOVECTOR)
>      .bdrv_co_get_block_status = iscsi_co_get_block_status,
>  #endif
>      .bdrv_co_discard      = iscsi_co_discard,

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Patch

diff --git a/block/iscsi.c b/block/iscsi.c
index 6152ef1..a2a961e 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -811,7 +811,7 @@  iscsi_getlength(BlockDriverState *bs)
     return len;
 }
 
-#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
+#if defined(LIBISCSI_FEATURE_IOVECTOR)
 
 static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,
                                                   int64_t sector_num,
@@ -903,7 +903,7 @@  out:
     return ret;
 }
 
-#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */
+#endif /* LIBISCSI_FEATURE_IOVECTOR */
 
 static int
 coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num,
@@ -1529,7 +1529,7 @@  static BlockDriver bdrv_iscsi = {
     .bdrv_getlength  = iscsi_getlength,
     .bdrv_truncate   = iscsi_truncate,
 
-#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
+#if defined(LIBISCSI_FEATURE_IOVECTOR)
     .bdrv_co_get_block_status = iscsi_co_get_block_status,
 #endif
     .bdrv_co_discard      = iscsi_co_discard,