| Message ID | 0D1E8821739E724A86F4D16902CE275C140E25C59C@inbmail01.lsi.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
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@lsi.com> Acked-by: Chandra Seetharaman <sekharan@us.ibm.com> > --- > > --- 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
On Wed, 2009-03-04 at 12:17 +0530, Chauhan, Vijay wrote: > Hi Hannes, > > Thanks for your comment. I have modified the patch with correct indentation. Resubmitting this patch. > For other ASC/ASQ codes (ie 04/04 - 04/09), I am currently working on it and will be adding it > in future if needed. checkpatch.pl doesn't like you very much: jejb@mulgrave> ./scripts/checkpatch.pl ~/tmp.mail ERROR: spaces required around that '=' (ctx:VxW) #135: FILE: drivers/scsi/device_handler/scsi_dh_rdac.c:464: + err= SCSI_DH_RETRY; ^ WARNING: line over 80 characters #154: FILE: drivers/scsi/device_handler/scsi_dh_rdac.c:482: + "MODE_SELECT failed with sense %02x/%02x/%02x.\n",sense_hdr.sense_key, ERROR: space required after that ',' (ctx:VxV) #154: FILE: drivers/scsi/device_handler/scsi_dh_rdac.c:482: + "MODE_SELECT failed with sense %02x/%02x/%02x.\n",sense_hdr.sense_key, ^ ERROR: space prohibited before that close parenthesis ')' #155: FILE: drivers/scsi/device_handler/scsi_dh_rdac.c:483: + sense_hdr.asc, sense_hdr.ascq ); total: 3 errors, 1 warnings, 54 lines checked I fixed all of this, but could you try running checkpatch.pl before submitting, next time. James -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
--- 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; }