diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-11-17 20:59:49 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-19 14:41:04 -0500 |
commit | b15ebe0b5d0b95aeb1d84cae3649df1e0e065e9b (patch) | |
tree | ff93ad5f8be5fe91c7e6cf4963253491ddd058fb /include/scsi/libsas.h | |
parent | 756f173fb5fa90ec15222e80fb579288be7794fd (diff) |
[SCSI] libsas: replace event locks with atomic bitops
The locks only served to make sure the pending event bitmask was updated
consistently.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r-- | include/scsi/libsas.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 7ecb5c1c0851..de63a664b5e5 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h | |||
@@ -215,7 +215,6 @@ struct sas_discovery_event { | |||
215 | }; | 215 | }; |
216 | 216 | ||
217 | struct sas_discovery { | 217 | struct sas_discovery { |
218 | spinlock_t disc_event_lock; | ||
219 | struct sas_discovery_event disc_work[DISC_NUM_EVENTS]; | 218 | struct sas_discovery_event disc_work[DISC_NUM_EVENTS]; |
220 | unsigned long pending; | 219 | unsigned long pending; |
221 | u8 fanout_sas_addr[8]; | 220 | u8 fanout_sas_addr[8]; |
@@ -272,7 +271,6 @@ struct asd_sas_event { | |||
272 | */ | 271 | */ |
273 | struct asd_sas_phy { | 272 | struct asd_sas_phy { |
274 | /* private: */ | 273 | /* private: */ |
275 | /* protected by ha->event_lock */ | ||
276 | struct asd_sas_event port_events[PORT_NUM_EVENTS]; | 274 | struct asd_sas_event port_events[PORT_NUM_EVENTS]; |
277 | struct asd_sas_event phy_events[PHY_NUM_EVENTS]; | 275 | struct asd_sas_event phy_events[PHY_NUM_EVENTS]; |
278 | 276 | ||
@@ -337,7 +335,6 @@ enum sas_ha_state { | |||
337 | 335 | ||
338 | struct sas_ha_struct { | 336 | struct sas_ha_struct { |
339 | /* private: */ | 337 | /* private: */ |
340 | spinlock_t event_lock; | ||
341 | struct sas_ha_event ha_events[HA_NUM_EVENTS]; | 338 | struct sas_ha_event ha_events[HA_NUM_EVENTS]; |
342 | unsigned long pending; | 339 | unsigned long pending; |
343 | 340 | ||