Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eddc569 authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ibmvfc: Fix another hang on module removal 



This fixes a hang on module removal. The module removal code was setting
the hosts's state to IBMVFC_HOST_OFFLINE before tearing down the kernel
thread, but, due to a bug in ibmvfc_wait_while_resetting, was not waiting
for the kernel thread's offlining work to be done prior to destroying
the kernel thread, which left the scsi host in a blocked state which we
never got out of.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 004dd5e8

drivers/scsi/ibmvscsi/ibmvfc.c

+4 −3
Original line number Diff line number Diff line
@@ -1059,9 +1059,10 @@ static void ibmvfc_get_starget_port_id(struct scsi_target *starget) 
static int ibmvfc_wait_while_resetting(struct ibmvfc_host *vhost)

{

	long timeout = wait_event_timeout(vhost->init_wait_q,

					  (vhost->state == IBMVFC_ACTIVE ||

					  ((vhost->state == IBMVFC_ACTIVE ||

					    vhost->state == IBMVFC_HOST_OFFLINE ||

					   vhost->state == IBMVFC_LINK_DEAD),

					    vhost->state == IBMVFC_LINK_DEAD) &&

					   vhost->action == IBMVFC_HOST_ACTION_NONE),

					  (init_timeout * HZ));



	return timeout ? 0 : -EIO;