diff options
author | Suma Ramars <sramars@cisco.com> | 2013-09-09 16:31:48 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-09-11 18:49:30 -0400 |
commit | 318c7c4325ad2c4e969a0b79008192ce8c054463 (patch) | |
tree | e16bf9acf97a54ab03eca050d3dbcfaab5fe1efd /drivers/scsi/fnic | |
parent | 87aa619c17976ac799b30110e830cf86d2e2e99a (diff) |
[SCSI] fnic: Remove QUEUE_FULL handling code
Remove fnic driver QUEUE_FULL handling code instead let SCSI mid layer
handle queue full and use its algorithm to ramp down/up queue
Signed-off-by: Suma Ramars <sramars@cisco.com>
Signed-off-by: Hiral Patel <hiralpat@cisco.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/fnic')
-rw-r--r-- | drivers/scsi/fnic/fnic_scsi.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index a97e6e584f8c..4ff0a332f298 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c | |||
@@ -818,38 +818,6 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic, | |||
818 | if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER) | 818 | if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER) |
819 | xfer_len -= icmnd_cmpl->residual; | 819 | xfer_len -= icmnd_cmpl->residual; |
820 | 820 | ||
821 | /* | ||
822 | * If queue_full, then try to reduce queue depth for all | ||
823 | * LUNS on the target. Todo: this should be accompanied | ||
824 | * by a periodic queue_depth rampup based on successful | ||
825 | * IO completion. | ||
826 | */ | ||
827 | if (icmnd_cmpl->scsi_status == QUEUE_FULL) { | ||
828 | struct scsi_device *t_sdev; | ||
829 | int qd = 0; | ||
830 | |||
831 | shost_for_each_device(t_sdev, sc->device->host) { | ||
832 | if (t_sdev->id != sc->device->id) | ||
833 | continue; | ||
834 | |||
835 | if (t_sdev->queue_depth > 1) { | ||
836 | qd = scsi_track_queue_full | ||
837 | (t_sdev, | ||
838 | t_sdev->queue_depth - 1); | ||
839 | if (qd == -1) | ||
840 | qd = t_sdev->host->cmd_per_lun; | ||
841 | shost_printk(KERN_INFO, | ||
842 | fnic->lport->host, | ||
843 | "scsi[%d:%d:%d:%d" | ||
844 | "] queue full detected," | ||
845 | "new depth = %d\n", | ||
846 | t_sdev->host->host_no, | ||
847 | t_sdev->channel, | ||
848 | t_sdev->id, t_sdev->lun, | ||
849 | t_sdev->queue_depth); | ||
850 | } | ||
851 | } | ||
852 | } | ||
853 | break; | 821 | break; |
854 | 822 | ||
855 | case FCPIO_TIMEOUT: /* request was timed out */ | 823 | case FCPIO_TIMEOUT: /* request was timed out */ |