Skip to contentSkip to conversation

ipr: Fix a race on multiple configuration changes

PATCH In review Kleber Sacilotto de Souza 2 participants 2 messages Feb 14, 2011 – Feb 15, 2011

Subsystems (2)
SCSI IBM Power Linux RAID adapter
lore
Share & tools
lore

Kleber Sacilotto de Souza

author
#0 lore raw

PATCH 1/1 ipr: Fix a race on multiple configuration changes

In a multiple configuration change scenario a remove notification can be followed by an immediate add notification for the same device, which will cause the device to be removed but never added back. This patch fixes the problem by ensuring that in such situations the device will be added back.

Signed-off-by Kleber Sacilotto de Souza <[email protected]>
---
 drivers/scsi/ipr.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/scsi/ipr.c +5 -2
index a8e24f0..1485767 100644
@@ -1301,7 +1301,7 @@ static void ipr_handle_config_change(struct ipr_ioa_cfg *ioa_cfg,
 			ipr_clear_res_target(res);
 			list_move_tail(&res->queue, &ioa_cfg->free_res_q);
 		}
-	} else if (!res->sdev) {
+	} else if (!res->sdev || res->del_from_ml) {
 		res->add_to_ml = 1;
 		if (ioa_cfg->allow_ml_add_del)
 			schedule_work(&ioa_cfg->work_q);

@@ -3104,7 +3104,10 @@ restart:
 				did_work = 1;
 				sdev = res->sdev;
 				if (!scsi_device_get(sdev)) {
-					list_move_tail(&res->queue, &ioa_cfg->free_res_q);
+					if (!res->add_to_ml)
+						list_move_tail(&res->queue, &ioa_cfg->free_res_q);
+					else
+						res->del_from_ml = 0;
 					spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 					scsi_remove_device(sdev);
 					scsi_device_put(sdev);
Signature · 6 lines
1.7.1


-- 
Kleber S. Souza
IBM Linux Technology Center