diff options
author | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
commit | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (patch) | |
tree | 1c4c89652c62a75da09f9b9442012007e4ac6250 /include/scsi/libsas.h | |
parent | 65f27f38446e1976cc98fd3004b110fedcddd189 (diff) |
WorkStruct: make allyesconfig
Fix up for make allyesconfig.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r-- | include/scsi/libsas.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 9582e8401669..9ccc0365aa89 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h | |||
@@ -200,9 +200,14 @@ struct domain_device { | |||
200 | void *lldd_dev; | 200 | void *lldd_dev; |
201 | }; | 201 | }; |
202 | 202 | ||
203 | struct sas_discovery_event { | ||
204 | struct work_struct work; | ||
205 | struct asd_sas_port *port; | ||
206 | }; | ||
207 | |||
203 | struct sas_discovery { | 208 | struct sas_discovery { |
204 | spinlock_t disc_event_lock; | 209 | spinlock_t disc_event_lock; |
205 | struct work_struct disc_work[DISC_NUM_EVENTS]; | 210 | struct sas_discovery_event disc_work[DISC_NUM_EVENTS]; |
206 | unsigned long pending; | 211 | unsigned long pending; |
207 | u8 fanout_sas_addr[8]; | 212 | u8 fanout_sas_addr[8]; |
208 | u8 eeds_a[8]; | 213 | u8 eeds_a[8]; |
@@ -248,14 +253,19 @@ struct asd_sas_port { | |||
248 | void *lldd_port; /* not touched by the sas class code */ | 253 | void *lldd_port; /* not touched by the sas class code */ |
249 | }; | 254 | }; |
250 | 255 | ||
256 | struct asd_sas_event { | ||
257 | struct work_struct work; | ||
258 | struct asd_sas_phy *phy; | ||
259 | }; | ||
260 | |||
251 | /* The phy pretty much is controlled by the LLDD. | 261 | /* The phy pretty much is controlled by the LLDD. |
252 | * The class only reads those fields. | 262 | * The class only reads those fields. |
253 | */ | 263 | */ |
254 | struct asd_sas_phy { | 264 | struct asd_sas_phy { |
255 | /* private: */ | 265 | /* private: */ |
256 | /* protected by ha->event_lock */ | 266 | /* protected by ha->event_lock */ |
257 | struct work_struct port_events[PORT_NUM_EVENTS]; | 267 | struct asd_sas_event port_events[PORT_NUM_EVENTS]; |
258 | struct work_struct phy_events[PHY_NUM_EVENTS]; | 268 | struct asd_sas_event phy_events[PHY_NUM_EVENTS]; |
259 | 269 | ||
260 | unsigned long port_events_pending; | 270 | unsigned long port_events_pending; |
261 | unsigned long phy_events_pending; | 271 | unsigned long phy_events_pending; |
@@ -307,10 +317,15 @@ struct scsi_core { | |||
307 | int queue_thread_kill; | 317 | int queue_thread_kill; |
308 | }; | 318 | }; |
309 | 319 | ||
320 | struct sas_ha_event { | ||
321 | struct work_struct work; | ||
322 | struct sas_ha_struct *ha; | ||
323 | }; | ||
324 | |||
310 | struct sas_ha_struct { | 325 | struct sas_ha_struct { |
311 | /* private: */ | 326 | /* private: */ |
312 | spinlock_t event_lock; | 327 | spinlock_t event_lock; |
313 | struct work_struct ha_events[HA_NUM_EVENTS]; | 328 | struct sas_ha_event ha_events[HA_NUM_EVENTS]; |
314 | unsigned long pending; | 329 | unsigned long pending; |
315 | 330 | ||
316 | struct scsi_core core; | 331 | struct scsi_core core; |