3 files changed, 11 insertions, 42 deletions

diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 93984c9dfe14..aee73fafccc8 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)
       aic_dev->r_total++;
       ptr = aic_dev->r_bins;
     }
-    if(cmd->device->simple_tags && cmd->request->cmd_flags & REQ_HARDBARRIER)
-    {
-      aic_dev->barrier_total++;
-      if(scb->tag_action == MSG_ORDERED_Q_TAG)
-        aic_dev->ordered_total++;
-    }
     x = scb->sg_length;
     x >>= 10;
     for(i=0; i<6; i++)
@@ -10125,7 +10119,6 @@ static void aic7xxx_buildscb(struct aic7xxx_host *p, struct scsi_cmnd *cmd,
   struct aic_dev_data *aic_dev = cmd->device->hostdata;
   struct scsi_device *sdptr = cmd->device;
   unsigned char tindex = TARGET_INDEX(cmd);
-  struct request *req = cmd->request;
   int use_sg;
 
   mask = (0x01 << tindex);
@@ -10144,19 +10137,8 @@ static void aic7xxx_buildscb(struct aic7xxx_host *p, struct scsi_cmnd *cmd,
     /* We always force TEST_UNIT_READY to untagged */
     if (cmd->cmnd[0] != TEST_UNIT_READY && sdptr->simple_tags)
     {
-      if (req->cmd_flags & REQ_HARDBARRIER)
-      {
-        if(sdptr->ordered_tags)
-        {
-          hscb->control |= MSG_ORDERED_Q_TAG;
-          scb->tag_action = MSG_ORDERED_Q_TAG;
-        }
-      }
-      else
-      {
-        hscb->control |= MSG_SIMPLE_Q_TAG;
-        scb->tag_action = MSG_SIMPLE_Q_TAG;
-      }
+      hscb->control |= MSG_SIMPLE_Q_TAG;
+      scb->tag_action = MSG_SIMPLE_Q_TAG;
     }
   }
   if ( !(aic_dev->dtr_pending) &&
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index f0cfba9a1fc8..535085cd27ec 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -130,17 +130,6 @@ static void sas_scsi_task_done(struct sas_task *task)
         sc->scsi_done(sc);
 }
 
-static enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd)
-{
-        enum task_attribute ta = TASK_ATTR_SIMPLE;
-        if (cmd->request && blk_rq_tagged(cmd->request)) {
-                if (cmd->device->ordered_tags &&
-                    (cmd->request->cmd_flags & REQ_HARDBARRIER))
-                        ta = TASK_ATTR_ORDERED;
-        }
-        return ta;
-}
-
 static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
                                                struct domain_device *dev,
                                                gfp_t gfp_flags)
@@ -160,7 +149,7 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
         task->ssp_task.retry_count = 1;
         int_to_scsilun(cmd->device->lun, &lun);
         memcpy(task->ssp_task.LUN, &lun.scsi_lun, 8);
-        task->ssp_task.task_attr = sas_scsi_get_task_attr(cmd);
+        task->ssp_task.task_attr = TASK_ATTR_SIMPLE;
         memcpy(task->ssp_task.cdb, cmd->cmnd, 16);
 
         task->scatter = scsi_sglist(cmd);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ffa0689ee840..20514c47a5aa 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2109,7 +2109,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         struct scsi_disk *sdkp = scsi_disk(disk);
         struct scsi_device *sdp = sdkp->device;
         unsigned char *buffer;
-        unsigned ordered;
+        unsigned flush = 0;
 
         SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp,
                                       "sd_revalidate_disk\n"));
@@ -2151,17 +2151,15 @@ static int sd_revalidate_disk(struct gendisk *disk)
 
         /*
          * We now have all cache related info, determine how we deal
-         * with ordered requests.  Note that as the current SCSI
-         * dispatch function can alter request order, we cannot use
-         * QUEUE_ORDERED_TAG_* even when ordered tag is supported.
+         * with flush requests.
          */
-        if (sdkp->WCE)
-                ordered = sdkp->DPOFUA
-                        ? QUEUE_ORDERED_DRAIN_FUA : QUEUE_ORDERED_DRAIN_FLUSH;
-        else
-                ordered = QUEUE_ORDERED_DRAIN;
+        if (sdkp->WCE) {
+                flush |= REQ_FLUSH;
+                if (sdkp->DPOFUA)
+                        flush |= REQ_FUA;
+        }
 
-        blk_queue_ordered(sdkp->disk->queue, ordered);
+        blk_queue_flush(sdkp->disk->queue, flush);
 
         set_capacity(disk, sdkp->capacity);
         kfree(buffer);