scsi: add new scsi-command flag for tagged commands

Currently scsi piggy backs on the block layer to define the concept
of a tagged command.  But we want to be able to have block-level host-wide
tags assigned even for untagged commands like the initial INQUIRY, so add
a new SCSI-level flag for commands that are tagged at the scsi level, so
that even commands without that set can have tags assigned to them.  Note
that this alredy is the case for the blk-mq code path, and this just lets
the old path catch up with it.

We also set this flag based upon sdev->simple_tags instead of the block
queue flag, so that it is entirely independent of the block layer tagging,
and thus always correct even if a driver doesn't use block level tagging
yet.

Also remove the old blk_rq_tagged; it was only used by SCSI drivers, and
removing it forces them to look for the proper replacement.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 474cc6dc98e2..5143d3213e86 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1767,7 +1767,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
          */
         if(NCR_700_get_depth(SCp->device) != 0
            && (!(hostdata->tag_negotiated & (1<<scmd_id(SCp)))
-               || !blk_rq_tagged(SCp->request))) {
+               || !(SCp->flags & SCMD_TAGGED))) {
                 CDEBUG(KERN_ERR, SCp, "has non zero depth %d\n",
                        NCR_700_get_depth(SCp->device));
                 return SCSI_MLQUEUE_DEVICE_BUSY;
@@ -1795,7 +1795,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
         printk("53c700: scsi%d, command ", SCp->device->host->host_no);
         scsi_print_command(SCp);
 #endif
-        if(blk_rq_tagged(SCp->request)
+        if ((SCp->flags & SCMD_TAGGED)
            && (hostdata->tag_negotiated &(1<<scmd_id(SCp))) == 0
            && NCR_700_get_tag_neg_state(SCp->device) == NCR_700_START_TAG_NEGOTIATION) {
                 scmd_printk(KERN_ERR, SCp, "Enabling Tag Command Queuing\n");
@@ -1809,7 +1809,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
          *
          * FIXME: This will royally screw up on multiple LUN devices
          * */
-        if(!blk_rq_tagged(SCp->request)
+        if (!(SCp->flags & SCMD_TAGGED)
            && (hostdata->tag_negotiated &(1<<scmd_id(SCp)))) {
                 scmd_printk(KERN_INFO, SCp, "Disabling Tag Command Queuing\n");
                 hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));