From: Swen Schillig <swen@xxxxxxxxxxxx> Synchronize the registration and de-registration with the SCSI layer at CCW registration, de-registration. Before we registered with the SCSI layer on adapter activation. This way the reg and de-reg process is in balance. Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx> Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx> --- drivers/s390/scsi/zfcp_aux.c | 3 ++- drivers/s390/scsi/zfcp_ccw.c | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) --- a/drivers/s390/scsi/zfcp_aux.c 2008-12-19 14:38:13.000000000 +0100 +++ b/drivers/s390/scsi/zfcp_aux.c 2008-12-19 14:38:26.000000000 +0100 @@ -516,7 +516,8 @@ int zfcp_adapter_enqueue(struct ccw_devi zfcp_fc_nameserver_init(adapter); - return 0; + if (!zfcp_adapter_scsi_register(adapter)) + return 0; sysfs_failed: zfcp_adapter_debug_unregister(adapter); --- a/drivers/s390/scsi/zfcp_ccw.c 2008-12-19 14:38:13.000000000 +0100 +++ b/drivers/s390/scsi/zfcp_ccw.c 2008-12-19 14:38:26.000000000 +0100 @@ -103,10 +103,6 @@ static int zfcp_ccw_set_online(struct cc if (retval) goto out; - retval = zfcp_adapter_scsi_register(adapter); - if (retval) - goto out_scsi_register; - /* initialize request counter */ BUG_ON(!zfcp_reqlist_isempty(adapter)); adapter->req_no = 0; @@ -120,8 +116,6 @@ static int zfcp_ccw_set_online(struct cc flush_work(&adapter->scan_work); return 0; - out_scsi_register: - zfcp_erp_thread_kill(adapter); out: up(&zfcp_data.config_sema); return retval; -- -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
