The following commit has been merged in the linux branch: commit 9e820afd0c4f3c8e8894aa91f5671fd7d11a787b Author: Christof Schmitt christof.schmitt@de.ibm.com Date: Tue Oct 13 10:44:11 2009 +0200

[SCSI] zfcp: Flush SCSI registration work when adding unit

When configuring a LUN for use in zfcp, flush the SCSI work to ensure the SCSI device has been created before returning. This means that a configuration procedure can run these commands in a script and the SCSI device is available immediately after the unit_add:

echo 1 > /sys/bus/ccw/drivers/zfcp/0.0.181d/online echo 0x401040C300000000 > \ /sys/bus/ccw/drivers/zfcp/0.0.181d/0x500507630313c562/unit_add lsscsi

Reviewed-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

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index 079a8cf..d310008 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c @@ -224,6 +224,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,

zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL); zfcp_erp_wait(unit->port->adapter); + flush_work(&unit->scsi_work); zfcp_unit_put(unit); out: mutex_unlock(&zfcp_data.config_mutex);