[SCSI] zfcp: Move workqueue to adapter struct

Remove the global driver work queue and replace it with a workqueue
local to the adapter. The usage of this workqueue makes this the
correct place for the structure. In addition multiple adapters won't
block each other due to the serialization of the queued work.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 0de059161b35..2e13d41269a4 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -572,7 +572,7 @@ void zfcp_scsi_schedule_rport_register(struct zfcp_port *port)
         zfcp_port_get(port);
         port->rport_task = RPORT_ADD;
 
-        if (!queue_work(zfcp_data.work_queue, &port->rport_work))
+        if (!queue_work(port->adapter->work_queue, &port->rport_work))
                 zfcp_port_put(port);
 }
 
@@ -581,7 +581,8 @@ void zfcp_scsi_schedule_rport_block(struct zfcp_port *port)
         zfcp_port_get(port);
         port->rport_task = RPORT_DEL;
 
-        if (port->rport && queue_work(zfcp_data.work_queue, &port->rport_work))
+        if (port->rport && queue_work(port->adapter->work_queue,
+                                      &port->rport_work))
                 return;
 
         zfcp_port_put(port);