aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptbase.c
diff options
context:
space:
mode:
authorMatthias Kaehlcke <matthias@kaehlcke.net>2008-03-09 07:16:27 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-04-07 13:15:44 -0400
commited5f606fef22e515331aab4c1f927775cf4af70e (patch)
tree26a86b0d7a7bb2e13b478fbd1f247ad2baab27b4 /drivers/message/fusion/mptbase.c
parent23a274c8a5adafc74a66f16988776fc7dd6f6e51 (diff)
[SCSI] mpt fusion: convert inactive_list_mutex to a mutex
the semaphore inactive_list_mutex is used as a mutex, convert it to the mutex API Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net> Acked-by: "Moore, Eric" <Eric.Moore@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
-rw-r--r--drivers/message/fusion/mptbase.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 6ee5876d0524..a34ddc7bce80 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -2180,7 +2180,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
2180 /* 2180 /*
2181 * Initalize link list for inactive raid volumes. 2181 * Initalize link list for inactive raid volumes.
2182 */ 2182 */
2183 init_MUTEX(&ioc->raid_data.inactive_list_mutex); 2183 mutex_init(&ioc->raid_data.inactive_list_mutex);
2184 INIT_LIST_HEAD(&ioc->raid_data.inactive_list); 2184 INIT_LIST_HEAD(&ioc->raid_data.inactive_list);
2185 2185
2186 if (ioc->bus_type == SAS) { 2186 if (ioc->bus_type == SAS) {
@@ -5166,13 +5166,13 @@ mpt_inactive_raid_list_free(MPT_ADAPTER *ioc)
5166 if (list_empty(&ioc->raid_data.inactive_list)) 5166 if (list_empty(&ioc->raid_data.inactive_list))
5167 return; 5167 return;
5168 5168
5169 down(&ioc->raid_data.inactive_list_mutex); 5169 mutex_lock(&ioc->raid_data.inactive_list_mutex);
5170 list_for_each_entry_safe(component_info, pNext, 5170 list_for_each_entry_safe(component_info, pNext,
5171 &ioc->raid_data.inactive_list, list) { 5171 &ioc->raid_data.inactive_list, list) {
5172 list_del(&component_info->list); 5172 list_del(&component_info->list);
5173 kfree(component_info); 5173 kfree(component_info);
5174 } 5174 }
5175 up(&ioc->raid_data.inactive_list_mutex); 5175 mutex_unlock(&ioc->raid_data.inactive_list_mutex);
5176} 5176}
5177 5177
5178/** 5178/**
@@ -5231,7 +5231,7 @@ mpt_inactive_raid_volumes(MPT_ADAPTER *ioc, u8 channel, u8 id)
5231 if (!handle_inactive_volumes) 5231 if (!handle_inactive_volumes)
5232 goto out; 5232 goto out;
5233 5233
5234 down(&ioc->raid_data.inactive_list_mutex); 5234 mutex_lock(&ioc->raid_data.inactive_list_mutex);
5235 for (i = 0; i < buffer->NumPhysDisks; i++) { 5235 for (i = 0; i < buffer->NumPhysDisks; i++) {
5236 if(mpt_raid_phys_disk_pg0(ioc, 5236 if(mpt_raid_phys_disk_pg0(ioc,
5237 buffer->PhysDisk[i].PhysDiskNum, &phys_disk) != 0) 5237 buffer->PhysDisk[i].PhysDiskNum, &phys_disk) != 0)
@@ -5251,7 +5251,7 @@ mpt_inactive_raid_volumes(MPT_ADAPTER *ioc, u8 channel, u8 id)
5251 list_add_tail(&component_info->list, 5251 list_add_tail(&component_info->list,
5252 &ioc->raid_data.inactive_list); 5252 &ioc->raid_data.inactive_list);
5253 } 5253 }
5254 up(&ioc->raid_data.inactive_list_mutex); 5254 mutex_unlock(&ioc->raid_data.inactive_list_mutex);
5255 5255
5256 out: 5256 out:
5257 if (buffer) 5257 if (buffer)