]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/suse-2.6.27.31/patches.arch/s390-02-10-zfcp-scan-online.patch
Merge branch 'master' into next
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.arch / s390-02-10-zfcp-scan-online.patch
1 From: Gerald Schaefer <geraldsc@de.ibm.com>
2 Subject: wait for port scan when setting FCP device online
3 References: bnc#434333
4
5 Description: wait for port scan when setting FCP device online
6 Symptom: running chccwdev -e xxxx; echo ... > unit_add in a script
7 does not work
8 Problem: The port scan in zfcp runs asynchronously to set_online
9 Solution: Wait for the port scan to complete in the zfcp set_online
10 packets due to hardware problems, an additional check for
11
12 Acked-by: John Jolly <jjolly@suse.de>
13 ---
14 drivers/s390/scsi/zfcp_ccw.c | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17 --- a/drivers/s390/scsi/zfcp_ccw.c 2008-10-17 18:26:54.000000000 +0200
18 +++ b/drivers/s390/scsi/zfcp_ccw.c 2008-10-17 18:31:42.000000000 +0200
19 @@ -118,7 +118,9 @@ static int zfcp_ccw_set_online(struct cc
20 zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED, 85,
21 NULL);
22 zfcp_erp_wait(adapter);
23 - goto out;
24 + up(&zfcp_data.config_sema);
25 + flush_work(&adapter->scan_work);
26 + return 0;
27
28 out_scsi_register:
29 zfcp_erp_thread_kill(adapter);