diff options
author | Hannes Reinecke <hare@suse.de> | 2007-06-14 09:16:45 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-06-17 17:03:11 -0400 |
commit | 0d2fcd9f9858a34f7056b3b1cb60ce0f883d06b6 (patch) | |
tree | 21c82df82bc70bc3e8439ef0ac34a10b0dfee589 /drivers/scsi/scsi_transport_fc.c | |
parent | 1c13899154f6f93e8c9ff3e981a90d5f21df2d6b (diff) |
[SCSI] fc_transport: Check portstates before invoking target scan
When a target scan is initiated from sysfs, we should check the
portstate prior to invoke scsi_scan_target().
Otherwise scsi_scan_target() might oops as the rport might already
been removed from the scsi host and the traversal from the rport to
the scsi_host in scsi_scan_target() will fail.
Also the portstate already told us that communication with the target
has failed, so it's quite pointless to try.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: James Smart <James.Smart@Emulex.Com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_transport_fc.c')
-rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 4953f0dca029..e8825709797e 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c | |||
@@ -1943,6 +1943,9 @@ static int fc_user_scan(struct Scsi_Host *shost, uint channel, | |||
1943 | if (rport->scsi_target_id == -1) | 1943 | if (rport->scsi_target_id == -1) |
1944 | continue; | 1944 | continue; |
1945 | 1945 | ||
1946 | if (rport->port_state != FC_PORTSTATE_ONLINE) | ||
1947 | continue; | ||
1948 | |||
1946 | if ((channel == SCAN_WILD_CARD || channel == rport->channel) && | 1949 | if ((channel == SCAN_WILD_CARD || channel == rport->channel) && |
1947 | (id == SCAN_WILD_CARD || id == rport->scsi_target_id)) { | 1950 | (id == SCAN_WILD_CARD || id == rport->scsi_target_id)) { |
1948 | scsi_scan_target(&rport->dev, rport->channel, | 1951 | scsi_scan_target(&rport->dev, rport->channel, |