aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-10-30 06:54:58 -0400
committerChristoph Hellwig <hch@lst.de>2014-11-12 05:19:40 -0500
commit609aa22f3be76d470a334f39cc2197112dc91bd7 (patch)
tree710daebfe903df387a3b4a9927badde84620bdc9 /drivers/scsi/scsi.c
parent125c99bc8b6b108d251169a86324a7ed3c6f3cce (diff)
scsi: remove ordered_tags scsi_device field
Remove the ordered_tags field, we haven't been issuing ordered tags based on it since the big barrier rework in 2010. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi.c')
-rw-r--r--drivers/scsi/scsi.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 9baeff03dd9b..22c449e926fa 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -789,19 +789,13 @@ void scsi_adjust_queue_depth(struct scsi_device *sdev, int tagged, int tags)
789 sdev->queue_depth = tags; 789 sdev->queue_depth = tags;
790 switch (tagged) { 790 switch (tagged) {
791 case 0: 791 case 0:
792 sdev->ordered_tags = 0;
793 sdev->simple_tags = 0; 792 sdev->simple_tags = 0;
794 break; 793 break;
795 case MSG_ORDERED_TAG: 794 case MSG_ORDERED_TAG:
796 sdev->ordered_tags = 1;
797 sdev->simple_tags = 1;
798 break;
799 case MSG_SIMPLE_TAG: 795 case MSG_SIMPLE_TAG:
800 sdev->ordered_tags = 0;
801 sdev->simple_tags = 1; 796 sdev->simple_tags = 1;
802 break; 797 break;
803 default: 798 default:
804 sdev->ordered_tags = 0;
805 sdev->simple_tags = 0; 799 sdev->simple_tags = 0;
806 sdev_printk(KERN_WARNING, sdev, 800 sdev_printk(KERN_WARNING, sdev,
807 "scsi_adjust_queue_depth, bad queue type, " 801 "scsi_adjust_queue_depth, bad queue type, "
@@ -857,11 +851,8 @@ int scsi_track_queue_full(struct scsi_device *sdev, int depth)
857 scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun); 851 scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
858 return -1; 852 return -1;
859 } 853 }
860 854
861 if (sdev->ordered_tags) 855 scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
862 scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth);
863 else
864 scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
865 return depth; 856 return depth;
866} 857}
867EXPORT_SYMBOL(scsi_track_queue_full); 858EXPORT_SYMBOL(scsi_track_queue_full);