xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: avoid ->change_queue_depth indirection for queue full tracking

Browse Source 
All drivers use the implementation for ramping the queue up and down, so
instead of overloading the change_queue_depth method call the
implementation diretly if the driver opts into it by setting the
track_queue_depth flag in the host template.

Note that a few drivers validated the new queue depth in their
change_queue_depth method, but as we never go over the queue depth
set during slave_configure or the sysfs file this isn't nessecary
and can safely be removed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Venkatesh Srinivas <venkateshs@google.com>
This commit is contained in:
Christoph Hellwig
2014-11-13 14:25:11 +01:00
parent 89dac7bb3b
commit c40ecc12cf
30 changed files with 73 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/virtio_scsi.c
View File

@@ -691,18 +691,7 @@ static int virtscsi_change_queue_depth(struct scsi_device *sdev,
struct Scsi_Host *shost = sdev->host;
int max_depth = shost->cmd_per_lun;
switch (reason) {
case SCSI_QDEPTH_QFULL: /* Drop qdepth in response to BUSY state */
scsi_track_queue_full(sdev, qdepth);
break;
case SCSI_QDEPTH_RAMP_UP: /* Raise qdepth after BUSY state resolved */
case SCSI_QDEPTH_DEFAULT: /* Manual change via sysfs */
scsi_adjust_queue_depth(sdev, min(max_depth, qdepth));
break;
default:
return -EOPNOTSUPP;
}
scsi_adjust_queue_depth(sdev, min(max_depth, qdepth));
return sdev->queue_depth;
}
@@ -770,6 +759,7 @@ static struct scsi_host_template virtscsi_host_template_single = {
.use_clustering = ENABLE_CLUSTERING,
.target_alloc = virtscsi_target_alloc,
.target_destroy = virtscsi_target_destroy,
.track_queue_depth = 1,
};
static struct scsi_host_template virtscsi_host_template_multi = {
@@ -788,6 +778,7 @@ static struct scsi_host_template virtscsi_host_template_multi = {
.use_clustering = ENABLE_CLUSTERING,
.target_alloc = virtscsi_target_alloc,
.target_destroy = virtscsi_target_destroy,
.track_queue_depth = 1,
};
#define virtscsi_config_get(vdev, fld) \