Commit 1288844e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

iscsi: reorganize iscsi_readcapacity_sync 



Avoid the goto, and use the same retry logic for the 10- and 16-
byte versions.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f0d2a4d4

block/iscsi.c

+46 −48
Original line number Diff line number Diff line
@@ -931,43 +931,34 @@ static int iscsi_readcapacity_sync(IscsiLun *iscsilun) 
    int ret = 0;

    int retries = ISCSI_CMD_RETRIES; 



try_again:

    do {

        if (task != NULL) {

            scsi_free_scsi_task(task);

            task = NULL;

        }



        switch (iscsilun->type) {

        case TYPE_DISK:

            task = iscsi_readcapacity16_sync(iscsilun->iscsi, iscsilun->lun);

        if (task == NULL || task->status != SCSI_STATUS_GOOD) {

            if (task != NULL && task->status == SCSI_STATUS_CHECK_CONDITION

                    && task->sense.key == SCSI_SENSE_UNIT_ATTENTION

                    && retries-- > 0) {

                scsi_free_scsi_task(task);

                goto try_again;

            }

            error_report("iSCSI: failed to send readcapacity16 command.");

            ret = -EINVAL;

            goto out;

        }

            if (task != NULL && task->status == SCSI_STATUS_GOOD) {

                rc16 = scsi_datain_unmarshall(task);

                if (rc16 == NULL) {

                    error_report("iSCSI: Failed to unmarshall readcapacity16 data.");

                    ret = -EINVAL;

            goto out;

        }

                } else {

                    iscsilun->block_size = rc16->block_length;

                    iscsilun->num_blocks = rc16->returned_lba + 1;

                }

            }

            break;

        case TYPE_ROM:

            task = iscsi_readcapacity10_sync(iscsilun->iscsi, iscsilun->lun, 0, 0);

        if (task == NULL || task->status != SCSI_STATUS_GOOD) {

            error_report("iSCSI: failed to send readcapacity10 command.");

            ret = -EINVAL;

            goto out;

        }

            if (task != NULL && task->status == SCSI_STATUS_GOOD) {

                rc10 = scsi_datain_unmarshall(task);

                if (rc10 == NULL) {

                    error_report("iSCSI: Failed to unmarshall readcapacity10 data.");

                    ret = -EINVAL;

            goto out;

        }

                } else {

                    iscsilun->block_size = rc10->block_size;

                    if (rc10->lba == 0) {

                        /* blank disk loaded */
@@ -975,16 +966,23 @@ try_again: 
                    } else {

                        iscsilun->num_blocks = rc10->lba + 1;

                    }

                }

            }

            break;

        default:

        break;

            return 0;

        }

    } while (task != NULL && task->status == SCSI_STATUS_CHECK_CONDITION

             && task->sense.key == SCSI_SENSE_UNIT_ATTENTION

             && retries-- > 0);



out:

    if (task == NULL || task->status != SCSI_STATUS_GOOD) {

        error_report("iSCSI: failed to send readcapacity10 command.");

        ret = -EINVAL;

    }

    if (task) {

        scsi_free_scsi_task(task);

    }



    return ret;

}