1 files changed, 18 insertions, 2 deletions

diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index ea28b5ca4c73..961bdf5d31cd 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -1753,7 +1753,7 @@ int fnic_abort_cmd(struct scsi_cmnd *sc)
         tag = sc->request->tag;
         FNIC_SCSI_DBG(KERN_DEBUG,
                 fnic->lport->host,
-                "Abort Cmd called FCID 0x%x, LUN 0x%x TAG %x flags %x\n",
+                "Abort Cmd called FCID 0x%x, LUN 0x%llx TAG %x flags %x\n",
                 rport->port_id, sc->device->lun, tag, CMD_FLAGS(sc));
 
         CMD_FLAGS(sc) = FNIC_NO_FLAGS;
@@ -2207,7 +2207,7 @@ int fnic_device_reset(struct scsi_cmnd *sc)
 
         rport = starget_to_rport(scsi_target(sc->device));
         FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
-                      "Device reset called FCID 0x%x, LUN 0x%x sc 0x%p\n",
+                      "Device reset called FCID 0x%x, LUN 0x%llx sc 0x%p\n",
                       rport->port_id, sc->device->lun, sc);
 
         if (lp->state != LPORT_ST_READY || !(lp->link_up))
@@ -2224,6 +2224,22 @@ int fnic_device_reset(struct scsi_cmnd *sc)
 
         tag = sc->request->tag;
         if (unlikely(tag < 0)) {
+                /*
+                 * XXX(hch): current the midlayer fakes up a struct
+                 * request for the explicit reset ioctls, and those
+                 * don't have a tag allocated to them.  The below
+                 * code pokes into midlayer structures to paper over
+                 * this design issue, but that won't work for blk-mq.
+                 *
+                 * Either someone who can actually test the hardware
+                 * will have to come up with a similar hack for the
+                 * blk-mq case, or we'll have to bite the bullet and
+                 * fix the way the EH ioctls work for real, but until
+                 * that happens we fail these explicit requests here.
+                 */
+                if (shost_use_blk_mq(sc->device->host))
+                        goto fnic_device_reset_end;
+
                 tag = fnic_scsi_host_start_tag(fnic, sc);
                 if (unlikely(tag == SCSI_NO_TAG))
                         goto fnic_device_reset_end;