1 files changed, 21 insertions, 12 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index ee0739b217b6..ed1e728763a2 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -933,7 +933,7 @@ static void ibmvfc_get_host_speed(struct Scsi_Host *shost)
                         fc_host_speed(shost) = FC_PORTSPEED_16GBIT;
                         break;
                 default:
-                        ibmvfc_log(vhost, 3, "Unknown port speed: %ld Gbit\n",
+                        ibmvfc_log(vhost, 3, "Unknown port speed: %lld Gbit\n",
                                    vhost->login_buf->resp.link_speed / 100);
                         fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;
                         break;
@@ -1322,7 +1322,9 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd,
                                                &evt->ext_list_token);
 
                 if (!evt->ext_list) {
-                        scmd_printk(KERN_ERR, scmd, "Can't allocate memory for scatterlist\n");
+                        scsi_dma_unmap(scmd);
+                        if (vhost->log_level > IBMVFC_DEFAULT_LOG_LEVEL)
+                                scmd_printk(KERN_ERR, scmd, "Can't allocate memory for scatterlist\n");
                         return -ENOMEM;
                 }
         }
@@ -1571,9 +1573,6 @@ static int ibmvfc_queuecommand(struct scsi_cmnd *cmnd,
         vfc_cmd->resp_len = sizeof(vfc_cmd->rsp);
         vfc_cmd->cancel_key = (unsigned long)cmnd->device->hostdata;
         vfc_cmd->tgt_scsi_id = rport->port_id;
-        if ((rport->supported_classes & FC_COS_CLASS3) &&
-            (fc_host_supported_classes(vhost->host) & FC_COS_CLASS3))
-                vfc_cmd->flags = IBMVFC_CLASS_3_ERR;
         vfc_cmd->iu.xfer_len = scsi_bufflen(cmnd);
         int_to_scsilun(cmnd->device->lun, &vfc_cmd->iu.lun);
         memcpy(vfc_cmd->iu.cdb, cmnd->cmnd, cmnd->cmd_len);
@@ -2149,8 +2148,8 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
 {
         const char *desc = ibmvfc_get_ae_desc(crq->event);
 
-        ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx,"
-                   " node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
+        ibmvfc_log(vhost, 3, "%s event received. scsi_id: %llx, wwpn: %llx,"
+                   " node_name: %llx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
 
         switch (crq->event) {
         case IBMVFC_AE_LINK_UP:
@@ -2184,7 +2183,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
                 ibmvfc_link_down(vhost, IBMVFC_HALTED);
                 break;
         default:
-                dev_err(vhost->dev, "Unknown async event received: %ld\n", crq->event);
+                dev_err(vhost->dev, "Unknown async event received: %lld\n", crq->event);
                 break;
         };
 }
@@ -2261,13 +2260,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)
          * actually sent
          */
         if (unlikely(!ibmvfc_valid_event(&vhost->pool, evt))) {
-                dev_err(vhost->dev, "Returned correlation_token 0x%08lx is invalid!\n",
+                dev_err(vhost->dev, "Returned correlation_token 0x%08llx is invalid!\n",
                         crq->ioba);
                 return;
         }
 
         if (unlikely(atomic_read(&evt->free))) {
-                dev_err(vhost->dev, "Received duplicate correlation_token 0x%08lx!\n",
+                dev_err(vhost->dev, "Received duplicate correlation_token 0x%08llx!\n",
                         crq->ioba);
                 return;
         }
@@ -3259,11 +3258,12 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
 
         tgt = mempool_alloc(vhost->tgt_pool, GFP_KERNEL);
         if (!tgt) {
-                dev_err(vhost->dev, "Target allocation failure for scsi id %08lx\n",
+                dev_err(vhost->dev, "Target allocation failure for scsi id %08llx\n",
                         scsi_id);
                 return -ENOMEM;
         }
 
+        memset(tgt, 0, sizeof(*tgt));
         tgt->scsi_id = scsi_id;
         tgt->new_scsi_id = scsi_id;
         tgt->vhost = vhost;
@@ -3574,9 +3574,18 @@ static void ibmvfc_log_ae(struct ibmvfc_host *vhost, int events)
 static void ibmvfc_tgt_add_rport(struct ibmvfc_target *tgt)
 {
         struct ibmvfc_host *vhost = tgt->vhost;
-        struct fc_rport *rport;
+        struct fc_rport *rport = tgt->rport;
         unsigned long flags;
 
+        if (rport) {
+                tgt_dbg(tgt, "Setting rport roles\n");
+                fc_remote_port_rolechg(rport, tgt->ids.roles);
+                spin_lock_irqsave(vhost->host->host_lock, flags);
+                ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE);
+                spin_unlock_irqrestore(vhost->host->host_lock, flags);
+                return;
+        }
+
         tgt_dbg(tgt, "Adding rport\n");
         rport = fc_remote_port_add(vhost->host, 0, &tgt->ids);
         spin_lock_irqsave(vhost->host->host_lock, flags);