diff options
author | Christof Schmitt <christof.schmitt@de.ibm.com> | 2009-04-17 09:08:15 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-04-27 11:07:37 -0400 |
commit | 70932935b61ee3dcc5a419ec4c367feb2ff808e4 (patch) | |
tree | 67e0925b8a44b3e163e4da36ecff299ba9e842bf /drivers/s390/scsi/zfcp_fsf.c | |
parent | 3869bb6e73f5f55ce16b13025726b0bfdf1f4aae (diff) |
[SCSI] zfcp: Fix oops when port disappears
The zfcp_port might have been removed, while the FC fast_io_fail timer
is still running and could trigger the terminate_rport_io callback.
Set the pointer to the zfcp_port to NULL and check accordingly
before using it.
Reviewed-by: Martin Petermann <martin@linux.vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_fsf.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 3f365ace7711..74dee32afba8 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
@@ -172,12 +172,16 @@ static void zfcp_fsf_link_down_info_eval(struct zfcp_fsf_req *req, char *id, | |||
172 | struct fsf_link_down_info *link_down) | 172 | struct fsf_link_down_info *link_down) |
173 | { | 173 | { |
174 | struct zfcp_adapter *adapter = req->adapter; | 174 | struct zfcp_adapter *adapter = req->adapter; |
175 | unsigned long flags; | ||
175 | 176 | ||
176 | if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED) | 177 | if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED) |
177 | return; | 178 | return; |
178 | 179 | ||
179 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); | 180 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); |
181 | |||
182 | read_lock_irqsave(&zfcp_data.config_lock, flags); | ||
180 | zfcp_scsi_schedule_rports_block(adapter); | 183 | zfcp_scsi_schedule_rports_block(adapter); |
184 | read_unlock_irqrestore(&zfcp_data.config_lock, flags); | ||
181 | 185 | ||
182 | if (!link_down) | 186 | if (!link_down) |
183 | goto out; | 187 | goto out; |