3 files changed, 22 insertions, 7 deletions

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 44b2f82a6eec..b09bdd8c3394 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -201,9 +201,14 @@ struct domain_device {
         void *lldd_dev;
 };
 
+struct sas_discovery_event {
+        struct work_struct work;
+        struct asd_sas_port *port;
+};
+
 struct sas_discovery {
         spinlock_t disc_event_lock;
-        struct work_struct disc_work[DISC_NUM_EVENTS];
+        struct sas_discovery_event disc_work[DISC_NUM_EVENTS];
         unsigned long    pending;
         u8     fanout_sas_addr[8];
         u8     eeds_a[8];
@@ -249,14 +254,19 @@ struct asd_sas_port {
         void *lldd_port;          /* not touched by the sas class code */
 };
 
+struct asd_sas_event {
+        struct work_struct work;
+        struct asd_sas_phy *phy;
+};
+
 /* The phy pretty much is controlled by the LLDD.
  * The class only reads those fields.
  */
 struct asd_sas_phy {
 /* private: */
         /* protected by ha->event_lock */
-        struct work_struct   port_events[PORT_NUM_EVENTS];
-        struct work_struct   phy_events[PHY_NUM_EVENTS];
+        struct asd_sas_event   port_events[PORT_NUM_EVENTS];
+        struct asd_sas_event   phy_events[PHY_NUM_EVENTS];
 
         unsigned long port_events_pending;
         unsigned long phy_events_pending;
@@ -308,10 +318,15 @@ struct scsi_core {
         int               queue_thread_kill;
 };
 
+struct sas_ha_event {
+        struct work_struct work;
+        struct sas_ha_struct *ha;
+};
+
 struct sas_ha_struct {
 /* private: */
         spinlock_t       event_lock;
-        struct work_struct ha_events[HA_NUM_EVENTS];
+        struct sas_ha_event ha_events[HA_NUM_EVENTS];
         unsigned long    pending;
 
         struct scsi_core core;
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index fd352323378b..798f7c7ee426 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -206,9 +206,9 @@ struct fc_rport {	/* aka fc_starget_attrs */
         u8 flags;
         struct list_head peers;
         struct device dev;
-        struct work_struct dev_loss_work;
+        struct delayed_work dev_loss_work;
         struct work_struct scan_work;
-        struct work_struct fail_io_work;
+        struct delayed_work fail_io_work;
         struct work_struct stgt_delete_work;
         struct work_struct rport_delete_work;
 } __attribute__((aligned(sizeof(unsigned long))));
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 4b95c89c95c9..d5c218ddc527 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -176,7 +176,7 @@ struct iscsi_cls_session {
 
         /* recovery fields */
         int recovery_tmo;
-        struct work_struct recovery_work;
+        struct delayed_work recovery_work;
 
         int target_id;