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>

3 files changed, 5 insertions, 4 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 94766599db00..11a1a7100ad6 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -227,7 +227,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
 
         INIT_LIST_HEAD(&ctx->active_reqs);
         INIT_LIST_HEAD(&ctx->run_list);
-        INIT_WORK(&ctx->wq, aio_kick_handler, ctx);
+        INIT_DELAYED_WORK(&ctx->wq, aio_kick_handler, ctx);
 
         if (aio_setup_ring(ctx) < 0)
                 goto out_freectx;
@@ -876,7 +876,7 @@ static void aio_kick_handler(void *data)
          * we're in a worker thread already, don't use queue_delayed_work,
          */
         if (requeue)
-                queue_work(aio_wq, &ctx->wq);
+                queue_delayed_work(aio_wq, &ctx->wq, 0);
 }
 
 
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 5fea638743e4..6f0487d6f44a 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -143,7 +143,7 @@ static struct nfs_client *nfs_alloc_client(const char *hostname,
         INIT_LIST_HEAD(&clp->cl_state_owners);
         INIT_LIST_HEAD(&clp->cl_unused);
         spin_lock_init(&clp->cl_lock);
-        INIT_WORK(&clp->cl_renewd, nfs4_renew_state, clp);
+        INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state, clp);
         rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
         clp->cl_boot_time = CURRENT_TIME;
         clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index ec1114b33d89..5ed798bc1cf7 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -21,7 +21,8 @@
 static void nfs_expire_automounts(void *list);
 
 LIST_HEAD(nfs_automount_list);
-static DECLARE_WORK(nfs_automount_task, nfs_expire_automounts, &nfs_automount_list);
+static DECLARE_DELAYED_WORK(nfs_automount_task, nfs_expire_automounts,
+                            &nfs_automount_list);
 int nfs_mountpoint_expiry_timeout = 500 * HZ;
 
 static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,