From d4a874b58b1664cfd904d94f4a20631fc4ef517f Mon Sep 17 00:00:00 2001 From: James Smart Date: Thu, 3 Nov 2011 11:10:40 -0400 Subject: [PATCH] --- yaml --- r: 286338 b: refs/heads/master c: 0eecee413d3157bac4477362bfc4b907b4b2988b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_transport_fc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b60642419b9f..8310a7cc5ef5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 410f02d813212eef1dedfcfd43460dd11a0ff707 +refs/heads/master: 0eecee413d3157bac4477362bfc4b907b4b2988b diff --git a/trunk/drivers/scsi/scsi_transport_fc.c b/trunk/drivers/scsi/scsi_transport_fc.c index 1b214910b714..f59d4a05ecd7 100644 --- a/trunk/drivers/scsi/scsi_transport_fc.c +++ b/trunk/drivers/scsi/scsi_transport_fc.c @@ -3048,7 +3048,8 @@ fc_remote_port_rolechg(struct fc_rport *rport, u32 roles) spin_lock_irqsave(shost->host_lock, flags); rport->flags &= ~(FC_RPORT_FAST_FAIL_TIMEDOUT | - FC_RPORT_DEVLOSS_PENDING); + FC_RPORT_DEVLOSS_PENDING | + FC_RPORT_DEVLOSS_CALLBK_DONE); spin_unlock_irqrestore(shost->host_lock, flags); /* ensure any stgt delete functions are done */