From ac3e978c52df98fd3584584110b229770a7bb9c0 Mon Sep 17 00:00:00 2001 From: Brian King Date: Mon, 19 Oct 2009 15:07:48 -0500 Subject: [PATCH] --- yaml --- r: 173594 b: refs/heads/master c: 7043110550f19c1556ad18dc4d63b1c9eaf9e4fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ac244d76c93e..6f84933a80a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 230934a6fe2f44d14ef840639f010c9cf4da098f +refs/heads/master: 7043110550f19c1556ad18dc4d63b1c9eaf9e4fd diff --git a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c index c35d8054dbbb..d37230faf086 100644 --- a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c @@ -4420,7 +4420,11 @@ static int ibmvfc_remove(struct vio_dev *vdev) ENTER; ibmvfc_remove_trace_file(&vhost->host->shost_dev.kobj, &ibmvfc_trace_attr); + + spin_lock_irqsave(vhost->host->host_lock, flags); ibmvfc_link_down(vhost, IBMVFC_HOST_OFFLINE); + spin_unlock_irqrestore(vhost->host->host_lock, flags); + ibmvfc_wait_while_resetting(vhost); ibmvfc_release_crq_queue(vhost); kthread_stop(vhost->work_thread);