On Wed, 2009-03-04 at 12:17 +0530, Chauhan, Vijay wrote:
> ---
>
> This patch is to add retry for mode select if mode select command is returned with sense NO_SENSE,
> UNIT_ATTENTION, ABORTED_COMMAND, NOT_READY(02/04/01). This patch reorganise the sense keys from
> if-else to switch-case format for better maintainability.
>
> Signed-off-by: Vijay Chauhan <vijay.chauhan@xxxxxxx>
Acked-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
> ---
>
> --- linux-2.6.29-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c.orig 2009-02-14 05:01:30.000000000 +0530
> +++ linux-2.6.29-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c 2009-03-04 11:25:19.000000000 +0530
> @@ -449,28 +449,40 @@ static int mode_select_handle_sense(stru
> unsigned char *sensebuf)
> {
> struct scsi_sense_hdr sense_hdr;
> - int sense, err = SCSI_DH_IO, ret;
> + int err = SCSI_DH_IO, ret;
>
> ret = scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE, &sense_hdr);
> if (!ret)
> goto done;
>
> err = SCSI_DH_OK;
> - sense = (sense_hdr.sense_key << 16) | (sense_hdr.asc << 8) |
> - sense_hdr.ascq;
> - /* If it is retryable failure, submit the c9 inquiry again */
> - if (sense == 0x59136 || sense == 0x68b02 || sense == 0xb8b02 ||
> - sense == 0x62900) {
> - /* 0x59136 - Command lock contention
> - * 0x[6b]8b02 - Quiesense in progress or achieved
> - * 0x62900 - Power On, Reset, or Bus Device Reset
> - */
> - err = SCSI_DH_RETRY;
> - }
>
> - if (sense)
> + switch (sense_hdr.sense_key) {
> + case NO_SENSE:
> + case ABORTED_COMMAND:
> + case UNIT_ATTENTION:
> + err= SCSI_DH_RETRY;
> + break;
> + case NOT_READY:
> + if (sense_hdr.asc == 0x04 && sense_hdr.ascq == 0x01)
> + /* LUN Not Ready and is in the Process of Becoming
> + * Ready
> + */
> + err = SCSI_DH_RETRY;
> + break;
> + case ILLEGAL_REQUEST:
> + if (sense_hdr.asc == 0x91 && sense_hdr.ascq == 0x36)
> + /*
> + * Command Lock contention
> + */
> + err = SCSI_DH_RETRY;
> + break;
> + default:
> sdev_printk(KERN_INFO, sdev,
> - "MODE_SELECT failed with sense 0x%x.\n", sense);
> + "MODE_SELECT failed with sense %02x/%02x/%02x.\n",sense_hdr.sense_key,
> + sense_hdr.asc, sense_hdr.ascq );
> + }
> +
> done:
> return err;
> }--
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
