lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] scsi_dh: Retry mode select in rdac device handler

Browse Source 
When the mode select sent to the controller fails with the retryable
error, it is better to retry the mode_select from the hardware handler
itself, instead of propagating the failure to dm-multipath.

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Chandra Seetharaman
2008-11-05 20:06:37 -08:00
committed by James Bottomley
parent 9eece961fc
commit c85f8cb925
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/device_handler/scsi_dh_rdac.c
View File

@@ -24,6 +24,7 @@
#include <scsi/scsi_dh.h> #include <scsi/scsi_dh.h>
#define RDAC_NAME "rdac" #define RDAC_NAME "rdac"
#define RDAC_RETRY_COUNT 5
/* /*
* LSI mode page stuff * LSI mode page stuff
@@ -478,21 +479,27 @@ static int send_mode_select(struct scsi_device *sdev, struct rdac_dh_data *h)
{ {
struct request *rq; struct request *rq;
struct request_queue *q = sdev->request_queue; struct request_queue *q = sdev->request_queue;
int err = SCSI_DH_RES_TEMP_UNAVAIL; int err, retry_cnt = RDAC_RETRY_COUNT;
retry:
err = SCSI_DH_RES_TEMP_UNAVAIL;
rq = rdac_failover_get(sdev, h); rq = rdac_failover_get(sdev, h);
if (!rq) if (!rq)
goto done; goto done;
sdev_printk(KERN_INFO, sdev, "queueing MODE_SELECT command.\n"); sdev_printk(KERN_INFO, sdev, "%s MODE_SELECT command.\n",
(retry_cnt == RDAC_RETRY_COUNT) ? "queueing" : "retrying");
err = blk_execute_rq(q, NULL, rq, 1); err = blk_execute_rq(q, NULL, rq, 1);
if (err != SCSI_DH_OK) blk_put_request(rq);
if (err != SCSI_DH_OK) {
err = mode_select_handle_sense(sdev, h->sense); err = mode_select_handle_sense(sdev, h->sense);
if (err == SCSI_DH_RETRY && retry_cnt--)
goto retry;
}
if (err == SCSI_DH_OK) if (err == SCSI_DH_OK)
h->state = RDAC_STATE_ACTIVE; h->state = RDAC_STATE_ACTIVE;
blk_put_request(rq);
done: done:
return err; return err;
} }