On 08/23/2017 01:19 PM, Marc-André Lureau wrote:
> It is confusing and could easily conflict with future versions.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> contrib/vhost-user-scsi/vhost-user-scsi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
> index 2ceca964f4..2ab14f1a83 100644
> --- a/contrib/vhost-user-scsi/vhost-user-scsi.c
> +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
> @@ -245,7 +245,7 @@ struct scsi_task {
>
> /** libiscsi integration **/
>
> -static int iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
> +static int vus_iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
> {
> struct iscsi_url *iscsi_url;
> struct iscsi_context *iscsi_ctx;
> @@ -705,7 +705,7 @@ int main(int argc, char **argv)
> }
> vdev_scsi = vdev_scsi_new(sock);
>
> - if (iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {
> + if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {
> goto err;
> }
>
>