]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
scsi: mptscsih: Remove bogus interpretation of request->ioprio
authorChristoph Hellwig <hch@lst.de>
Thu, 13 Oct 2016 08:46:41 +0000 (10:46 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Nov 2016 22:29:48 +0000 (17:29 -0500)
Having an I/O priority does not mean we should send all requests as HEAD
OF QUEUE tags.

Reported-by: Adam Manzanares <adam.manzanares@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinicke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/message/fusion/mptscsih.c

index 6c9fc11efb87221dc2994c63babe8664809c9821..08a807d6a44f6a7ab2f05fbef4aefa453a62238f 100644 (file)
@@ -1366,15 +1366,10 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt)
        /* Default to untagged. Once a target structure has been allocated,
         * use the Inquiry data to determine if device supports tagged.
         */
-       if ((vdevice->vtarget->tflags & MPT_TARGET_FLAGS_Q_YES)
-           && (SCpnt->device->tagged_supported)) {
+       if ((vdevice->vtarget->tflags & MPT_TARGET_FLAGS_Q_YES) &&
+           SCpnt->device->tagged_supported)
                scsictl = scsidir | MPI_SCSIIO_CONTROL_SIMPLEQ;
-               if (SCpnt->request && SCpnt->request->ioprio) {
-                       if (((SCpnt->request->ioprio & 0x7) == 1) ||
-                               !(SCpnt->request->ioprio & 0x7))
-                               scsictl |= MPI_SCSIIO_CONTROL_HEADOFQ;
-               }
-       } else
+       else
                scsictl = scsidir | MPI_SCSIIO_CONTROL_UNTAGGED;