Merge branch 'master' into for-next

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

5 files changed, 19 insertions, 17 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index d37c7331f244..0bcd5806bd9a 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -156,6 +156,8 @@ static int zfcp_erp_required_act(int want, struct zfcp_adapter *adapter,
                 if (!(a_status & ZFCP_STATUS_COMMON_RUNNING) ||
                       a_status & ZFCP_STATUS_COMMON_ERP_FAILED)
                         return 0;
+                if (p_status & ZFCP_STATUS_COMMON_NOESC)
+                        return need;
                 if (!(a_status & ZFCP_STATUS_COMMON_UNBLOCKED))
                         need = ZFCP_ERP_ACTION_REOPEN_ADAPTER;
                 /* fall through */
@@ -188,6 +190,9 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                 atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE,
                                 &zfcp_sdev->status);
                 erp_action = &zfcp_sdev->erp_action;
+                memset(erp_action, 0, sizeof(struct zfcp_erp_action));
+                erp_action->port = port;
+                erp_action->sdev = sdev;
                 if (!(atomic_read(&zfcp_sdev->status) &
                       ZFCP_STATUS_COMMON_RUNNING))
                         act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -200,6 +205,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                 zfcp_erp_action_dismiss_port(port);
                 atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &port->status);
                 erp_action = &port->erp_action;
+                memset(erp_action, 0, sizeof(struct zfcp_erp_action));
+                erp_action->port = port;
                 if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_RUNNING))
                         act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
                 break;
@@ -209,6 +216,7 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                 zfcp_erp_action_dismiss_adapter(adapter);
                 atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &adapter->status);
                 erp_action = &adapter->erp_action;
+                memset(erp_action, 0, sizeof(struct zfcp_erp_action));
                 if (!(atomic_read(&adapter->status) &
                       ZFCP_STATUS_COMMON_RUNNING))
                         act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -218,10 +226,7 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                 return NULL;
         }
 
-        memset(erp_action, 0, sizeof(struct zfcp_erp_action));
         erp_action->adapter = adapter;
-        erp_action->port = port;
-        erp_action->sdev = sdev;
         erp_action->action = need;
         erp_action->status = act_status;
 
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h
index 938d50360166..b464ae01086c 100644
--- a/drivers/s390/scsi/zfcp_fc.h
+++ b/drivers/s390/scsi/zfcp_fc.h
@@ -270,7 +270,7 @@ void zfcp_fc_eval_fcp_rsp(struct fcp_resp_with_ext *fcp_rsp,
         if (unlikely(rsp_flags & FCP_SNS_LEN_VAL)) {
                 sense = (char *) &fcp_rsp[1];
                 if (rsp_flags & FCP_RSP_LEN_VAL)
-                        sense += fcp_rsp->ext.fr_sns_len;
+                        sense += fcp_rsp->ext.fr_rsp_len;
                 sense_len = min(fcp_rsp->ext.fr_sns_len,
                                 (u32) SCSI_SENSE_BUFFERSIZE);
                 memcpy(scsi->sense_buffer, sense, sense_len);
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index beaf0916ceab..2eb7dd56ab80 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -532,9 +532,6 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
                 fc_host_port_type(shost) = FC_PORTTYPE_UNKNOWN;
                 adapter->hydra_version = 0;
 
-                atomic_set_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
-                                &adapter->status);
-
                 zfcp_fsf_link_down_info_eval(req,
                         &qtcb->header.fsf_status_qual.link_down_info);
                 break;
@@ -854,7 +851,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_cmnd(struct scsi_cmnd *scmnd)
 
         zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);
 
-        req->data = zfcp_sdev;
+        req->data = sdev;
         req->handler = zfcp_fsf_abort_fcp_command_handler;
         req->qtcb->header.lun_handle = zfcp_sdev->lun_handle;
         req->qtcb->header.port_handle = zfcp_sdev->port->handle;
@@ -2072,8 +2069,6 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req)
         struct fcp_resp_with_ext *fcp_rsp;
         unsigned long flags;
 
-        zfcp_fsf_fcp_handler_common(req);
-
         read_lock_irqsave(&req->adapter->abort_lock, flags);
 
         scpnt = req->data;
@@ -2082,6 +2077,8 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req)
                 return;
         }
 
+        zfcp_fsf_fcp_handler_common(req);
+
         if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {
                 set_host_byte(scpnt, DID_TRANSPORT_DISRUPTED);
                 goto skip_fsfstatus;
@@ -2173,12 +2170,13 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd)
         struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
         struct zfcp_qdio *qdio = adapter->qdio;
         struct fsf_qtcb_bottom_io *io;
+        unsigned long flags;
 
         if (unlikely(!(atomic_read(&zfcp_sdev->status) &
                        ZFCP_STATUS_COMMON_UNBLOCKED)))
                 return -EBUSY;
 
-        spin_lock(&qdio->req_q_lock);
+        spin_lock_irqsave(&qdio->req_q_lock, flags);
         if (atomic_read(&qdio->req_q_free) <= 0) {
                 atomic_inc(&qdio->req_q_full);
                 goto out;
@@ -2242,7 +2240,7 @@ failed_scsi_cmnd:
         zfcp_fsf_req_free(req);
         scsi_cmnd->host_scribble = NULL;
 out:
-        spin_unlock(&qdio->req_q_lock);
+        spin_unlock_irqrestore(&qdio->req_q_lock, flags);
         return retval;
 }
 
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 50286d8707f3..63529ed801eb 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -76,8 +76,8 @@ static void zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result)
         scpnt->scsi_done(scpnt);
 }
 
-static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
-                                  void (*done) (struct scsi_cmnd *))
+static
+int zfcp_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scpnt)
 {
         struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scpnt->device);
         struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
@@ -87,7 +87,6 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
         /* reset the status for this request */
         scpnt->result = 0;
         scpnt->host_scribble = NULL;
-        scpnt->scsi_done = done;
 
         scsi_result = fc_remote_port_chkready(rport);
         if (unlikely(scsi_result)) {
diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c
index 1119c535a667..20796ebc33ce 100644
--- a/drivers/s390/scsi/zfcp_unit.c
+++ b/drivers/s390/scsi/zfcp_unit.c
@@ -142,6 +142,8 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun)
                 return -ENOMEM;
         }
 
+        get_device(&port->dev);
+
         if (device_register(&unit->dev)) {
                 put_device(&unit->dev);
                 return -ENOMEM;
@@ -152,8 +154,6 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun)
                 return -EINVAL;
         }
 
-        get_device(&port->dev);
-
         write_lock_irq(&port->unit_list_lock);
         list_add_tail(&unit->list, &port->unit_list);
         write_unlock_irq(&port->unit_list_lock);