diff options
author | Tejun Heo <tj@kernel.org> | 2010-09-03 05:56:16 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 06:35:36 -0400 |
commit | 9cbbdca44ae1a6f512ea1e2be11ced8bbb9d430a (patch) | |
tree | b27713199bcc27c56ccbf7f05b43bb3810a1f412 /drivers/scsi/aic7xxx_old.c | |
parent | 4913efe456c987057e5d36a3f0a55422a9072cae (diff) |
block: remove spurious uses of REQ_HARDBARRIER
REQ_HARDBARRIER is deprecated. Remove spurious uses in the following
users. Please note that other than osdblk, all other uses were
already spurious before deprecation.
* osdblk: osdblk_rq_fn() won't receive any request with
REQ_HARDBARRIER set. Remove the test for it.
* pktcdvd: use of REQ_HARDBARRIER in pkt_generic_packet() doesn't mean
anything. Removed.
* aic7xxx_old: Setting MSG_ORDERED_Q_TAG on REQ_HARDBARRIER is
spurious. Removed.
* sas_scsi_host: Setting TASK_ATTR_ORDERED on REQ_HARDBARRIER is
spurious. Removed.
* scsi_tcq: The ordered tag path wasn't being used anyway. Removed.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Boaz Harrosh <bharrosh@panasas.com>
Cc: James Bottomley <James.Bottomley@suse.de>
Cc: Peter Osterlund <petero2@telia.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/scsi/aic7xxx_old.c')
-rw-r--r-- | drivers/scsi/aic7xxx_old.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c index 93984c9dfe14..e1cd6062776c 100644 --- a/drivers/scsi/aic7xxx_old.c +++ b/drivers/scsi/aic7xxx_old.c | |||
@@ -2850,12 +2850,6 @@ aic7xxx_done(struct aic7xxx_host *p, struct aic7xxx_scb *scb) | |||
2850 | aic_dev->r_total++; | 2850 | aic_dev->r_total++; |
2851 | ptr = aic_dev->r_bins; | 2851 | ptr = aic_dev->r_bins; |
2852 | } | 2852 | } |
2853 | if(cmd->device->simple_tags && cmd->request->cmd_flags & REQ_HARDBARRIER) | ||
2854 | { | ||
2855 | aic_dev->barrier_total++; | ||
2856 | if(scb->tag_action == MSG_ORDERED_Q_TAG) | ||
2857 | aic_dev->ordered_total++; | ||
2858 | } | ||
2859 | x = scb->sg_length; | 2853 | x = scb->sg_length; |
2860 | x >>= 10; | 2854 | x >>= 10; |
2861 | for(i=0; i<6; i++) | 2855 | for(i=0; i<6; i++) |
@@ -10144,19 +10138,8 @@ static void aic7xxx_buildscb(struct aic7xxx_host *p, struct scsi_cmnd *cmd, | |||
10144 | /* We always force TEST_UNIT_READY to untagged */ | 10138 | /* We always force TEST_UNIT_READY to untagged */ |
10145 | if (cmd->cmnd[0] != TEST_UNIT_READY && sdptr->simple_tags) | 10139 | if (cmd->cmnd[0] != TEST_UNIT_READY && sdptr->simple_tags) |
10146 | { | 10140 | { |
10147 | if (req->cmd_flags & REQ_HARDBARRIER) | 10141 | hscb->control |= MSG_SIMPLE_Q_TAG; |
10148 | { | 10142 | scb->tag_action = MSG_SIMPLE_Q_TAG; |
10149 | if(sdptr->ordered_tags) | ||
10150 | { | ||
10151 | hscb->control |= MSG_ORDERED_Q_TAG; | ||
10152 | scb->tag_action = MSG_ORDERED_Q_TAG; | ||
10153 | } | ||
10154 | } | ||
10155 | else | ||
10156 | { | ||
10157 | hscb->control |= MSG_SIMPLE_Q_TAG; | ||
10158 | scb->tag_action = MSG_SIMPLE_Q_TAG; | ||
10159 | } | ||
10160 | } | 10143 | } |
10161 | } | 10144 | } |
10162 | if ( !(aic_dev->dtr_pending) && | 10145 | if ( !(aic_dev->dtr_pending) && |