WorkStruct: Separate delayable and non-delayable events.

Separate delayable work items from non-delayable work items be splitting them
into a separate structure (delayed_work), which incorporates a work_struct and
the timer_list removed from work_struct.

The work_struct struct is huge, and this limits it's usefulness.  On a 64-bit
architecture it's nearly 100 bytes in size.  This reduces that by half for the
non-delayable type of event.

Signed-Off-By: David Howells <dhowells@redhat.com>

4 files changed, 7 insertions, 10 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 915a55a6cc14..0bb4b4dced76 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -937,12 +937,9 @@ void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *), void *data,
         if (ap->pflags & ATA_PFLAG_FLUSH_PORT_TASK)
                 return;
 
-        PREPARE_WORK(&ap->port_task, fn, data);
+        PREPARE_DELAYED_WORK(&ap->port_task, fn, data);
 
-        if (!delay)
-                rc = queue_work(ata_wq, &ap->port_task);
-        else
-                rc = queue_delayed_work(ata_wq, &ap->port_task, delay);
+        rc = queue_delayed_work(ata_wq, &ap->port_task, delay);
 
         /* rc == 0 means that another user is using port task */
         WARN_ON(rc == 0);
@@ -5320,8 +5317,8 @@ void ata_port_init(struct ata_port *ap, struct ata_host *host,
         ap->msg_enable = ATA_MSG_DRV | ATA_MSG_ERR | ATA_MSG_WARN;
 #endif
 
-        INIT_WORK(&ap->port_task, NULL, NULL);
-        INIT_WORK(&ap->hotplug_task, ata_scsi_hotplug, ap);
+        INIT_DELAYED_WORK(&ap->port_task, NULL, NULL);
+        INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug, ap);
         INIT_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan, ap);
         INIT_LIST_HEAD(&ap->eh_done_q);
         init_waitqueue_head(&ap->eh_wait_q);
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 02b2b2787d9b..9f6b7cc74fd9 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -332,7 +332,7 @@ void ata_scsi_error(struct Scsi_Host *host)
         if (ap->pflags & ATA_PFLAG_LOADING)
                 ap->pflags &= ~ATA_PFLAG_LOADING;
         else if (ap->pflags & ATA_PFLAG_SCSI_HOTPLUG)
-                queue_work(ata_aux_wq, &ap->hotplug_task);
+                queue_delayed_work(ata_aux_wq, &ap->hotplug_task, 0);
 
         if (ap->pflags & ATA_PFLAG_RECOVERED)
                 ata_port_printk(ap, KERN_INFO, "EH complete\n");
diff --git a/drivers/char/random.c b/drivers/char/random.c
index eb6b13f4211a..f2ab61f3e8ae 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1424,7 +1424,7 @@ static unsigned int ip_cnt;
 
 static void rekey_seq_generator(void *private_);
 
-static DECLARE_WORK(rekey_work, rekey_seq_generator, NULL);
+static DECLARE_DELAYED_WORK(rekey_work, rekey_seq_generator, NULL);
 
 /*
  * Lock avoidance:
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index e90ea39c7c4b..7297acfe520c 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3580,7 +3580,7 @@ static void initialize_tty_struct(struct tty_struct *tty)
         tty->overrun_time = jiffies;
         tty->buf.head = tty->buf.tail = NULL;
         tty_buffer_init(tty);
-        INIT_WORK(&tty->buf.work, flush_to_ldisc, tty);
+        INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc, tty);
         init_MUTEX(&tty->buf.pty_sem);
         mutex_init(&tty->termios_mutex);
         init_waitqueue_head(&tty->write_wait);