From 0d9eb275b55831ce27061ac28dbaaf7164563025 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Thu, 5 Nov 2009 11:18:09 -0600 Subject: [PATCH] --- yaml --- r: 173698 b: refs/heads/master c: 2bc1c59dbdefdb6f9767e06efb86bbdb2923a8be h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_transport_fc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bf3fdcbaf672..600a47d1476d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97ee20886cfd257a7818087c1638ca60b9ffd192 +refs/heads/master: 2bc1c59dbdefdb6f9767e06efb86bbdb2923a8be diff --git a/trunk/drivers/scsi/scsi_transport_fc.c b/trunk/drivers/scsi/scsi_transport_fc.c index 3ce56b3b2cd7..600502aa3b61 100644 --- a/trunk/drivers/scsi/scsi_transport_fc.c +++ b/trunk/drivers/scsi/scsi_transport_fc.c @@ -3809,8 +3809,9 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost, return; while (!blk_queue_plugged(q)) { - if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED)) - break; + if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED) && + !(rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT)) + break; req = blk_fetch_request(q); if (!req)