diff options
| author | Jens Axboe <axboe@fb.com> | 2015-01-02 15:03:42 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-01-02 15:03:42 -0700 |
| commit | 5d7bf4d8f664468223846abcfc683f4694014074 (patch) | |
| tree | 942496e8b6b6753502bcdbc513f0547c80af3d30 /drivers/scsi/scsi.c | |
| parent | 35b489d32fcc37e8735f41aa794b24cf9d1e74f5 (diff) | |
| parent | b7392d2247cfe6771f95d256374f1a8e6a6f48d6 (diff) | |
Merge tag 'v3.19-rc2' into for-3.20/core
Linux 3.19-rc2
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 1ad0c36375b8..e02885451425 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -739,34 +739,12 @@ int scsi_track_queue_full(struct scsi_device *sdev, int depth) if (sdev->last_queue_full_count <= 10) return 0; - if (sdev->last_queue_full_depth < 8) { - /* Drop back to untagged */ - scsi_set_tag_type(sdev, 0); - scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun); - return -1; - } return scsi_change_queue_depth(sdev, depth); } EXPORT_SYMBOL(scsi_track_queue_full); /** - * scsi_change_queue_type() - Change a device's queue type - * @sdev: The SCSI device whose queue depth is to change - * @tag_type: Identifier for queue type - */ -int scsi_change_queue_type(struct scsi_device *sdev, int tag_type) -{ - if (!sdev->tagged_supported) - return 0; - - scsi_set_tag_type(sdev, tag_type); - return tag_type; - -} -EXPORT_SYMBOL(scsi_change_queue_type); - -/** * scsi_vpd_inquiry - Request a device provide us with a VPD page * @sdev: The device to ask * @buffer: Where to put the result |