apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

scsi: don't set tagging state from scsi_adjust_queue_depth

Browse Source 
Remove the tagged argument from scsi_adjust_queue_depth, and just let it
handle the queue depth.  For most drivers those two are fairly separate,
given that most modern drivers don't care about the SCSI "tagged" status
of a command at all, and many old drivers allow queuing of multiple
untagged commands in the driver.

Instead we start out with the ->simple_tags flag set before calling
->slave_configure, which is how all drivers actually looking at
->simple_tags except for one worke anyway.  The one other case looks
broken, but I've kept the behavior as-is for now.

Except for that we only change ->simple_tags from the ->change_queue_type,
and when rejecting a tag message in a single driver, so keeping this
churn out of scsi_adjust_queue_depth is a clear win.

Now that the usage of scsi_adjust_queue_depth is more obvious we can
also remove all the trivial instances in ->slave_alloc or ->slave_configure
that just set it to the cmd_per_lun default.

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: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christoph Hellwig
2014-11-03 20:15:14 +01:00
parent 2ecb204d07
commit c8b09f6fb6
57 changed files with 120 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/scsi/scsi_mid_low_api.txt
+4 -8
View File
@@ -271,9 +271,9 @@ init_this_scsi_driver() ----+
slave_destroy() *** slave_destroy() ***
------------------------------------------------------------ ------------------------------------------------------------
The mid level invokes scsi_adjust_queue_depth() with tagged queuing off and The mid level invokes scsi_adjust_queue_depth() with "cmd_per_lun" for that
"cmd_per_lun" for that host as the queue length. These settings can be host as the queue length. These settings can be overridden by a
overridden by a slave_configure() supplied by the LLD. slave_configure() supplied by the LLD.
*** For scsi devices that the mid level tries to scan but do not *** For scsi devices that the mid level tries to scan but do not
respond, a slave_alloc(), slave_destroy() pair is called. respond, a slave_alloc(), slave_destroy() pair is called.
@@ -438,9 +438,6 @@ int scsi_add_host(struct Scsi_Host *shost, struct device * dev)
/** /**
* scsi_adjust_queue_depth - allow LLD to change queue depth on a SCSI device * scsi_adjust_queue_depth - allow LLD to change queue depth on a SCSI device
* @sdev: pointer to SCSI device to change queue depth on * @sdev: pointer to SCSI device to change queue depth on
* @tagged: 0 - no tagged queuing
* MSG_SIMPLE_TAG - simple tagged queuing
* MSG_ORDERED_TAG - ordered tagged queuing
* @tags Number of tags allowed if tagged queuing enabled, * @tags Number of tags allowed if tagged queuing enabled,
* or number of commands the LLD can queue up * or number of commands the LLD can queue up
* in non-tagged mode (as per cmd_per_lun). * in non-tagged mode (as per cmd_per_lun).
@@ -456,8 +453,7 @@ int scsi_add_host(struct Scsi_Host *shost, struct device * dev)
* Defined in: drivers/scsi/scsi.c [see source code for more notes] * Defined in: drivers/scsi/scsi.c [see source code for more notes]
* *
**/ **/
void scsi_adjust_queue_depth(struct scsi_device * sdev, int tagged, void scsi_adjust_queue_depth(struct scsi_device *sdev, int tags)
int tags)
/** /**
drivers/ata/libata-scsi.c
+2 -2
View File
@@ -1164,7 +1164,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id)); depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id));
depth = min(ATA_MAX_QUEUE - 1, depth); depth = min(ATA_MAX_QUEUE - 1, depth);
scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth); scsi_adjust_queue_depth(sdev, depth);
} }
blk_queue_flush_queueable(q, false); blk_queue_flush_queueable(q, false);
@@ -1282,7 +1282,7 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
if (sdev->queue_depth == queue_depth) if (sdev->queue_depth == queue_depth)
return -EINVAL; return -EINVAL;
scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth); scsi_adjust_queue_depth(sdev, queue_depth);
return queue_depth; return queue_depth;
} }
drivers/infiniband/ulp/srp/ib_srp.c
+1 -1
View File
@@ -2278,7 +2278,7 @@ srp_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
max_depth = 1; max_depth = 1;
if (qdepth > max_depth) if (qdepth > max_depth)
qdepth = max_depth; qdepth = max_depth;
scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth); scsi_adjust_queue_depth(sdev, qdepth);
} else if (reason == SCSI_QDEPTH_QFULL) } else if (reason == SCSI_QDEPTH_QFULL)
scsi_track_queue_full(sdev, qdepth); scsi_track_queue_full(sdev, qdepth);
else else
drivers/message/fusion/mptscsih.c
+1 -1
View File
@@ -2347,7 +2347,7 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
if (qdepth > max_depth) if (qdepth > max_depth)
qdepth = max_depth; qdepth = max_depth;
scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth); scsi_adjust_queue_depth(sdev, qdepth);
return sdev->queue_depth; return sdev->queue_depth;
} }
drivers/s390/scsi/zfcp_scsi.c
+3 -5
View File
@@ -37,13 +37,13 @@ static int zfcp_scsi_change_queue_depth(struct scsi_device *sdev, int depth,
{ {
switch (reason) { switch (reason) {
case SCSI_QDEPTH_DEFAULT: case SCSI_QDEPTH_DEFAULT:
scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth); scsi_adjust_queue_depth(sdev, depth);
break; break;
case SCSI_QDEPTH_QFULL: case SCSI_QDEPTH_QFULL:
scsi_track_queue_full(sdev, depth); scsi_track_queue_full(sdev, depth);
break; break;
case SCSI_QDEPTH_RAMP_UP: case SCSI_QDEPTH_RAMP_UP:
scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth); scsi_adjust_queue_depth(sdev, depth);
break; break;
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
@@ -66,9 +66,7 @@ static void zfcp_scsi_slave_destroy(struct scsi_device *sdev)
static int zfcp_scsi_slave_configure(struct scsi_device *sdp) static int zfcp_scsi_slave_configure(struct scsi_device *sdp)
{ {
if (sdp->tagged_supported) if (sdp->tagged_supported)
scsi_adjust_queue_depth(sdp, MSG_SIMPLE_TAG, default_depth); scsi_adjust_queue_depth(sdp, default_depth);
else
scsi_adjust_queue_depth(sdp, 0, 1);
return 0; return 0;
} }
drivers/scsi/3w-9xxx.c
+1 -1
View File
@@ -198,7 +198,7 @@ static int twa_change_queue_depth(struct scsi_device *sdev, int queue_depth,
if (queue_depth > TW_Q_LENGTH-2) if (queue_depth > TW_Q_LENGTH-2)
queue_depth = TW_Q_LENGTH-2; queue_depth = TW_Q_LENGTH-2;
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); scsi_adjust_queue_depth(sdev, queue_depth);
return queue_depth; return queue_depth;
} /* End twa_change_queue_depth() */ } /* End twa_change_queue_depth() */
drivers/scsi/3w-sas.c
+1 -1
View File
@@ -200,7 +200,7 @@ static int twl_change_queue_depth(struct scsi_device *sdev, int queue_depth,
if (queue_depth > TW_Q_LENGTH-2) if (queue_depth > TW_Q_LENGTH-2)
queue_depth = TW_Q_LENGTH-2; queue_depth = TW_Q_LENGTH-2;
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); scsi_adjust_queue_depth(sdev, queue_depth);
return queue_depth; return queue_depth;
} /* End twl_change_queue_depth() */ } /* End twl_change_queue_depth() */
drivers/scsi/3w-xxxx.c
+1 -1
View File
@@ -532,7 +532,7 @@ static int tw_change_queue_depth(struct scsi_device *sdev, int queue_depth,
if (queue_depth > TW_Q_LENGTH-2) if (queue_depth > TW_Q_LENGTH-2)
queue_depth = TW_Q_LENGTH-2; queue_depth = TW_Q_LENGTH-2;
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); scsi_adjust_queue_depth(sdev, queue_depth);
return queue_depth; return queue_depth;
} /* End tw_change_queue_depth() */ } /* End tw_change_queue_depth() */
drivers/scsi/53c700.c
+9 -8
View File
@@ -902,8 +902,10 @@ process_message(struct Scsi_Host *host, struct NCR_700_Host_Parameters *hostdata
/* we're done negotiating */ /* we're done negotiating */
NCR_700_set_tag_neg_state(SCp->device, NCR_700_FINISHED_TAG_NEGOTIATION); NCR_700_set_tag_neg_state(SCp->device, NCR_700_FINISHED_TAG_NEGOTIATION);
hostdata->tag_negotiated &= ~(1<<scmd_id(SCp)); hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));
SCp->device->tagged_supported = 0; SCp->device->tagged_supported = 0;
scsi_adjust_queue_depth(SCp->device, 0, host->cmd_per_lun); scsi_adjust_queue_depth(SCp->device, host->cmd_per_lun);
scsi_set_tag_type(SCp->device, 0);
} else { } else {
shost_printk(KERN_WARNING, host, shost_printk(KERN_WARNING, host,
"(%d:%d) Unexpected REJECT Message %s\n", "(%d:%d) Unexpected REJECT Message %s\n",
@@ -2050,12 +2052,10 @@ NCR_700_slave_configure(struct scsi_device *SDp)
/* to do here: allocate memory; build a queue_full list */ /* to do here: allocate memory; build a queue_full list */
if(SDp->tagged_supported) { if(SDp->tagged_supported) {
scsi_adjust_queue_depth(SDp, MSG_ORDERED_TAG, NCR_700_DEFAULT_TAGS); scsi_adjust_queue_depth(SDp, NCR_700_DEFAULT_TAGS);
NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION); NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION);
} else {
/* initialise to default depth */
scsi_adjust_queue_depth(SDp, 0, SDp->host->cmd_per_lun);
} }
if(hostdata->fast) { if(hostdata->fast) {
/* Find the correct offset and period via domain validation */ /* Find the correct offset and period via domain validation */
if (!spi_initial_dv(SDp->sdev_target)) if (!spi_initial_dv(SDp->sdev_target))
@@ -2083,7 +2083,7 @@ NCR_700_change_queue_depth(struct scsi_device *SDp, int depth, int reason)
if (depth > NCR_700_MAX_TAGS) if (depth > NCR_700_MAX_TAGS)
depth = NCR_700_MAX_TAGS; depth = NCR_700_MAX_TAGS;
scsi_adjust_queue_depth(SDp, scsi_get_tag_type(SDp), depth); scsi_adjust_queue_depth(SDp, depth);
return depth; return depth;
} }
@@ -2101,15 +2101,16 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)
if (change_tag) if (change_tag)
scsi_target_quiesce(SDp->sdev_target); scsi_target_quiesce(SDp->sdev_target);
scsi_set_tag_type(SDp, tag_type);
if (!tag_type) { if (!tag_type) {
/* shift back to the default unqueued number of commands /* shift back to the default unqueued number of commands
* (the user can still raise this) */ * (the user can still raise this) */
scsi_adjust_queue_depth(SDp, 0, SDp->host->cmd_per_lun); scsi_adjust_queue_depth(SDp, SDp->host->cmd_per_lun);
hostdata->tag_negotiated &= ~(1 << sdev_id(SDp)); hostdata->tag_negotiated &= ~(1 << sdev_id(SDp));
} else { } else {
/* Here, we cleared the negotiation flag above, so this /* Here, we cleared the negotiation flag above, so this
* will force the driver to renegotiate */ * will force the driver to renegotiate */
scsi_adjust_queue_depth(SDp, tag_type, SDp->queue_depth); scsi_adjust_queue_depth(SDp, SDp->queue_depth);
if (change_tag) if (change_tag)
NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION); NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION);
} }
drivers/scsi/BusLogic.c
+2 -2
View File
@@ -2327,12 +2327,12 @@ static int blogic_slaveconfig(struct scsi_device *dev)
if (qdepth == 0) if (qdepth == 0)
qdepth = BLOGIC_MAX_AUTO_TAG_DEPTH; qdepth = BLOGIC_MAX_AUTO_TAG_DEPTH;
adapter->qdepth[tgt_id] = qdepth; adapter->qdepth[tgt_id] = qdepth;
scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, qdepth); scsi_adjust_queue_depth(dev, qdepth);
} else { } else {
adapter->tagq_ok &= ~(1 << tgt_id); adapter->tagq_ok &= ~(1 << tgt_id);
qdepth = adapter->untag_qdepth; qdepth = adapter->untag_qdepth;
adapter->qdepth[tgt_id] = qdepth; adapter->qdepth[tgt_id] = qdepth;
scsi_adjust_queue_depth(dev, 0, qdepth); scsi_adjust_queue_depth(dev, qdepth);
} }
qdepth = 0; qdepth = 0;
for (tgt_id = 0; tgt_id < adapter->maxdev; tgt_id++) for (tgt_id = 0; tgt_id < adapter->maxdev; tgt_id++)
drivers/scsi/aacraid/linit.c
+4 -4
View File
@@ -462,9 +462,9 @@ static int aac_slave_configure(struct scsi_device *sdev)
depth = 256; depth = 256;
else if (depth < 2) else if (depth < 2)
depth = 2; depth = 2;
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth); scsi_adjust_queue_depth(sdev, depth);
} else } else
scsi_adjust_queue_depth(sdev, 0, 1); scsi_adjust_queue_depth(sdev, 1);
return 0; return 0;
} }
@@ -504,9 +504,9 @@ static int aac_change_queue_depth(struct scsi_device *sdev, int depth,
depth = 256; depth = 256;
else if (depth < 2) else if (depth < 2)
depth = 2; depth = 2;
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth); scsi_adjust_queue_depth(sdev, depth);
} else } else
scsi_adjust_queue_depth(sdev, 0, 1); scsi_adjust_queue_depth(sdev, 1);
return sdev->queue_depth; return sdev->queue_depth;
} }
drivers/scsi/advansys.c
+2 -5
View File
@@ -7706,7 +7706,7 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
asc_dvc->cfg->can_tagged_qng |= tid_bit; asc_dvc->cfg->can_tagged_qng |= tid_bit;
asc_dvc->use_tagged_qng |= tid_bit; asc_dvc->use_tagged_qng |= tid_bit;
} }
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, scsi_adjust_queue_depth(sdev,
asc_dvc->max_dvc_qng[sdev->id]); asc_dvc->max_dvc_qng[sdev->id]);
} }
} else { } else {
@@ -7714,7 +7714,6 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
asc_dvc->cfg->can_tagged_qng &= ~tid_bit; asc_dvc->cfg->can_tagged_qng &= ~tid_bit;
asc_dvc->use_tagged_qng &= ~tid_bit; asc_dvc->use_tagged_qng &= ~tid_bit;
} }
scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
} }
if ((sdev->lun == 0) && if ((sdev->lun == 0) &&
@@ -7849,10 +7848,8 @@ advansys_wide_slave_configure(struct scsi_device *sdev, ADV_DVC_VAR *adv_dvc)
} }
if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported) { if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported) {
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, scsi_adjust_queue_depth(sdev,
adv_dvc->max_dvc_qng); adv_dvc->max_dvc_qng);
} else {
scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
} }
} }
drivers/scsi/aic7xxx/aic79xx_osm.c
+2 -5
View File
@@ -1469,11 +1469,8 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) { switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
case AHD_DEV_Q_BASIC: case AHD_DEV_Q_BASIC:
scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TASK,
dev->openings + dev->active);
break;
case AHD_DEV_Q_TAGGED: case AHD_DEV_Q_TAGGED:
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TASK, scsi_adjust_queue_depth(sdev,
dev->openings + dev->active); dev->openings + dev->active);
break; break;
default: default:
@@ -1483,7 +1480,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
* serially on the controller/device. This should * serially on the controller/device. This should
* remove some latency. * remove some latency.
*/ */
scsi_adjust_queue_depth(sdev, 0, 1); scsi_adjust_queue_depth(sdev, 1);
break; break;
} }
} }
drivers/scsi/aic7xxx/aic7xxx_osm.c
+2 -6
View File
@@ -1335,13 +1335,9 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
} }
switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) { switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) {
case AHC_DEV_Q_BASIC: case AHC_DEV_Q_BASIC:
scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TASK,
dev->openings + dev->active);
break;
case AHC_DEV_Q_TAGGED: case AHC_DEV_Q_TAGGED:
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TASK, scsi_adjust_queue_depth(sdev,
dev->openings + dev->active); dev->openings + dev->active);
break;
default: default:
/* /*
* We allow the OS to queue 2 untagged transactions to * We allow the OS to queue 2 untagged transactions to
@@ -1349,7 +1345,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
* serially on the controller/device. This should * serially on the controller/device. This should
* remove some latency. * remove some latency.
*/ */
scsi_adjust_queue_depth(sdev, 0, 2); scsi_adjust_queue_depth(sdev, 2);
break; break;
} }
} }
drivers/scsi/arcmsr/arcmsr_hba.c
+1 -1
View File
@@ -122,7 +122,7 @@ static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev,
if (queue_depth > ARCMSR_MAX_CMD_PERLUN) if (queue_depth > ARCMSR_MAX_CMD_PERLUN)
queue_depth = ARCMSR_MAX_CMD_PERLUN; queue_depth = ARCMSR_MAX_CMD_PERLUN;
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); scsi_adjust_queue_depth(sdev, queue_depth);
return queue_depth; return queue_depth;
} }
drivers/scsi/bfa/bfad_im.c
+1 -2
View File
@@ -776,7 +776,7 @@ bfad_thread_workq(struct bfad_s *bfad)
static int static int
bfad_im_slave_configure(struct scsi_device *sdev) bfad_im_slave_configure(struct scsi_device *sdev)
{ {
scsi_adjust_queue_depth(sdev, 0, bfa_lun_queue_depth); scsi_adjust_queue_depth(sdev, bfa_lun_queue_depth);
return 0; return 0;
} }
@@ -867,7 +867,6 @@ bfad_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
if (tmp_sdev->id != sdev->id) if (tmp_sdev->id != sdev->id)
continue; continue;
scsi_adjust_queue_depth(tmp_sdev, scsi_adjust_queue_depth(tmp_sdev,
MSG_SIMPLE_TAG,
tmp_sdev->queue_depth + 1); tmp_sdev->queue_depth + 1);
itnim->last_ramp_up_time = jiffies; itnim->last_ramp_up_time = jiffies;
drivers/scsi/csiostor/csio_scsi.c
+1 -1
View File
@@ -2241,7 +2241,7 @@ csio_slave_alloc(struct scsi_device *sdev)
static int static int
csio_slave_configure(struct scsi_device *sdev) csio_slave_configure(struct scsi_device *sdev)
{ {
scsi_adjust_queue_depth(sdev, 0, csio_lun_qdepth); scsi_adjust_queue_depth(sdev, csio_lun_qdepth);
return 0; return 0;
} }
drivers/scsi/dpt_i2o.c
+1 -3
View File
@@ -415,10 +415,8 @@ static int adpt_slave_configure(struct scsi_device * device)
pHba = (adpt_hba *) host->hostdata[0]; pHba = (adpt_hba *) host->hostdata[0];
if (host->can_queue && device->tagged_supported) { if (host->can_queue && device->tagged_supported) {
scsi_adjust_queue_depth(device, MSG_SIMPLE_TAG, scsi_adjust_queue_depth(device,
host->can_queue - 1); host->can_queue - 1);
} else {
scsi_adjust_queue_depth(device, 0, 1);
} }
return 0; return 0;
} }
drivers/scsi/eata.c
+3 -5
View File
@@ -946,20 +946,18 @@ static int eata2x_slave_configure(struct scsi_device *dev)
if (TLDEV(dev->type) && dev->tagged_supported) { if (TLDEV(dev->type) && dev->tagged_supported) {
if (tag_mode == TAG_SIMPLE) { if (tag_mode == TAG_SIMPLE) {
scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, tqd);
tag_suffix = ", simple tags"; tag_suffix = ", simple tags";
} else if (tag_mode == TAG_ORDERED) { } else if (tag_mode == TAG_ORDERED) {
scsi_adjust_queue_depth(dev, MSG_ORDERED_TAG, tqd);
tag_suffix = ", ordered tags"; tag_suffix = ", ordered tags";
} else { } else {
scsi_adjust_queue_depth(dev, 0, tqd);
tag_suffix = ", no tags"; tag_suffix = ", no tags";
} }
scsi_adjust_queue_depth(dev, tqd);
} else if (TLDEV(dev->type) && linked_comm) { } else if (TLDEV(dev->type) && linked_comm) {
scsi_adjust_queue_depth(dev, 0, tqd); scsi_adjust_queue_depth(dev, tqd);
tag_suffix = ", untagged"; tag_suffix = ", untagged";
} else { } else {
scsi_adjust_queue_depth(dev, 0, utqd); scsi_adjust_queue_depth(dev, utqd);
tag_suffix = ""; tag_suffix = "";
} }
drivers/scsi/esas2r/esas2r.h
-3
View File
@@ -972,9 +972,6 @@ u8 handle_hba_ioctl(struct esas2r_adapter *a,
struct atto_ioctl *ioctl_hba); struct atto_ioctl *ioctl_hba);
int esas2r_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd); int esas2r_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd);
int esas2r_show_info(struct seq_file *m, struct Scsi_Host *sh); int esas2r_show_info(struct seq_file *m, struct Scsi_Host *sh);
int esas2r_slave_alloc(struct scsi_device *dev);
int esas2r_slave_configure(struct scsi_device *dev);
void esas2r_slave_destroy(struct scsi_device *dev);
int esas2r_change_queue_depth(struct scsi_device *dev, int depth, int reason); int esas2r_change_queue_depth(struct scsi_device *dev, int depth, int reason);
long esas2r_proc_ioctl(struct file *fp, unsigned int cmd, unsigned long arg); long esas2r_proc_ioctl(struct file *fp, unsigned int cmd, unsigned long arg);

Some files were not shown because too many files have changed in this diff Show More