aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKei Tokunaga <tokunaga.keiich@jp.fujitsu.com>2010-04-07 06:17:24 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-07-27 13:03:50 -0400
commit3e84beba608dee5a7c7711a3503eb2f335c78fca (patch)
tree58dc95fa9acb677e84c770ddf00cf7eaaa4321a0
parentcb237ef7a45f22373575b2d2ad2d06f7d38d6bce (diff)
[SCSI] mptsas: fixed hot-removal processing
This patch fixes mptsas disk hot-removal processing. The hot-removal processing doesn't complete because of this condition. drivers/message/fusion/mptsas.c: mptsas_taskmgmt_complete() if ((mptsas_find_vtarget(ioc, channel, id)) && !ioc->fw_events_off) mptsas_queue_device_delete(...); mptsas_queue_device_delete(), which must be called for hot-removal, never gets called because mptsas_find_vtarget() always returns 0 here. At that time, the vtarget has already been freed in mptsas_target_destroy(), and also the scsi_device has been marked as SDEV_DEL. As a result of the issue, port deletion functions won't get called and the device ends up being in an incomplete state. (Some data structures and sysfs entries, which should be removed in hot-removal, remain.) One side effect of this is that a hot-addition of the device (bringing the device back on) fails. This patch just removes mptsas_find_vtarget() from the if-state condition. Signed-off-by: Kei Tokunaga <tokunaga.keiich@jp.fujitsu.com> Acked-by: "Desai, Kashyap" <Kashyap.Desai@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/message/fusion/mptsas.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index f42781b92bdd..46cc90c9bfc6 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1261,7 +1261,7 @@ mptsas_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
1261 * enable work queue to remove device from upper layers 1261 * enable work queue to remove device from upper layers
1262 */ 1262 */
1263 list_del(&target_reset_list->list); 1263 list_del(&target_reset_list->list);
1264 if ((mptsas_find_vtarget(ioc, channel, id)) && !ioc->fw_events_off) 1264 if (!ioc->fw_events_off)
1265 mptsas_queue_device_delete(ioc, 1265 mptsas_queue_device_delete(ioc,
1266 &target_reset_list->sas_event_data); 1266 &target_reset_list->sas_event_data);
1267 1267