diff options
| author | Bhanu Prakash Gollapudi <bprakash@broadcom.com> | 2012-02-10 17:18:57 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-19 09:27:26 -0600 |
| commit | 0083208473d3d9a87dcdffaf36a2dbe718dfe282 (patch) | |
| tree | 7b6255000c21add05e2d5ee5cbe0ff427b1cae89 /drivers/scsi/libfc | |
| parent | d4042e9c84864a5666dc8ec14b3c1a5597b6a73f (diff) | |
| download | linux-0083208473d3d9a87dcdffaf36a2dbe718dfe282.tar.gz linux-0083208473d3d9a87dcdffaf36a2dbe718dfe282.tar.bz2 linux-0083208473d3d9a87dcdffaf36a2dbe718dfe282.zip | |
[SCSI] libfc: Handle discovery failure during ctlr link down
While we wait for GPN_FT response, if the ctlr link goes down, the stack
generates a completion for GPN_FT with error FC_EXCH_CLOSED, and reports a
discovery error. Discovery is not retried in this case, and rightly so.
However, the 'pending' flag stays set, which does not allow subsequent
discovery to succeed as GPN_FT will never be issued. Fix it by clearing the
pending flag when the discovery fails due to GPN_FT failure.
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/libfc')
| -rw-r--r-- | drivers/scsi/libfc/fc_disc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index 1d1b0c9da29b..8e561e6a557c 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c @@ -337,6 +337,13 @@ static void fc_disc_error(struct fc_disc *disc, struct fc_frame *fp) schedule_delayed_work(&disc->disc_work, delay); } else fc_disc_done(disc, DISC_EV_FAILED); + } else if (PTR_ERR(fp) == -FC_EX_CLOSED) { + /* + * if discovery fails due to lport reset, clear + * pending flag so that subsequent discovery can + * continue + */ + disc->pending = 0; } } |