afs: add afs_wq and use it instead of the system workqueue
PATCH 1/1 afs: add afs_wq and use it instead of the system workqueue
flush_scheduled_work() is going away. afs needs to make sure all the works it has queued have finished before being unloaded and there can be arbitrary number of pending works. Add afs_wq and use it as the flush domain instead of the system workqueue.
While at it, convert cancel_delayed_work() + flush_scheduled_work() to cancel_delayed_work_sync() in afs_mntpt_kill_timer().
Signed-off-by Tejun Heo <[email protected]>
--- fs/afs/cmservice.c | 12 ++++++------ fs/afs/internal.h | 1 + fs/afs/main.c | 13 +++++++++++-- fs/afs/mntpt.c | 11 +++++------ fs/afs/rxrpc.c | 2 +- fs/afs/server.c | 13 +++++++------ fs/afs/vlocation.c | 14 +++++++------- 7 files changed, 38 insertions(+), 28 deletions(-)
fs/afs/cmservice.c +6 -6
@@ -289,7 +289,7 @@ static int afs_deliver_cb_callback(struc call->server = server;INIT_WORK (&call->work, SRXAFSCB_CallBack); -schedule_work (&call->work); +queue_work (afs_wq, &call->work);return 0 ; }
@@ -336,7 +336,7 @@ static int afs_deliver_cb_init_call_back call->server = server;INIT_WORK (&call->work, SRXAFSCB_InitCallBackState); -schedule_work (&call->work); +queue_work (afs_wq, &call->work);return 0 ; }
@@ -367,7 +367,7 @@ static int afs_deliver_cb_init_call_back call->server = server;INIT_WORK (&call->work, SRXAFSCB_InitCallBackState); -schedule_work (&call->work); +queue_work (afs_wq, &call->work);return 0 ; }
@@ -400,7 +400,7 @@ static int afs_deliver_cb_probe(struct a call->state =AFS_CALL_REPLYING ;INIT_WORK (&call->work, SRXAFSCB_Probe); -schedule_work (&call->work); +queue_work (afs_wq, &call->work);return 0 ; }
@@ -496,7 +496,7 @@ static int afs_deliver_cb_probe_uuid(str call->state =AFS_CALL_REPLYING ;INIT_WORK (&call->work, SRXAFSCB_ProbeUuid); -schedule_work (&call->work); +queue_work (afs_wq, &call->work);return 0 ; }
@@ -580,6 +580,6 @@ static int afs_deliver_cb_tell_me_about_ call->state =AFS_CALL_REPLYING ;INIT_WORK (&call->work, SRXAFSCB_TellMeAboutYourself); -schedule_work (&call->work); +queue_work (afs_wq, &call->work);return 0 ; }
fs/afs/internal.h +1 -0
@@ -576,6 +576,7 @@ extern int afs_drop_inode(struct inode */* * main.c */ +extern struct workqueue_struct *afs_wq;extern struct afs_uuid afs_uuid;/*
fs/afs/main.c +11 -2
@@ -30,6 +30,7 @@ module_param(rootcell, charp, 0);MODULE_PARM_DESC (rootcell,"root AFS cell name and VL server IP addr list" );struct afs_uuid afs_uuid; +struct workqueue_struct *afs_wq;/* * get a client UUID
@@ -87,10 +88,16 @@ static int __init afs_init(void)if (ret <0 )return ret; +/* create workqueue */ + ret = -ENOMEM ; + afs_wq =alloc_workqueue ("afs" ,0 ,0 ); +if (!afs_wq) +return ret; +/* register the /proc stuff */ ret =afs_proc_init ();if (ret <0 ) -return ret; + goto error_proc;#ifdef CONFIG_AFS_FSCACHE /* we want to be able to cache */
@@ -140,6 +147,8 @@ error_cell_init: error_cache:#endif afs_proc_cleanup (); +error_proc: +destroy_workqueue (afs_wq);rcu_barrier ();printk (KERN_ERR "kAFS: failed to register: %d\n" , ret);return ret;
@@ -163,7 +172,7 @@ static void __exit afs_exit(void)afs_purge_servers ();afs_callback_update_kill ();afs_vlocation_purge (); -flush_scheduled_work (); +destroy_workqueue (afs_wq);afs_cell_purge ();#ifdef CONFIG_AFS_FSCACHE fscache_unregister_netfs (&afs_cache_netfs);
fs/afs/mntpt.c +5 -6
@@ -267,8 +267,8 @@ static void *afs_mntpt_follow_link(strucpath_put (&nd->path); nd->path.mnt = newmnt; nd->path.dentry =dget (newmnt->mnt_root); -schedule_delayed_work (&afs_mntpt_expiry_timer, - afs_mntpt_expiry_timeout *HZ ); +queue_delayed_work (afs_wq, &afs_mntpt_expiry_timer, + afs_mntpt_expiry_timeout *HZ );break ;case -EBUSY :/* someone else made a mount here whilst we were busy */
@@ -294,8 +294,8 @@ static void afs_mntpt_expiry_timed_out(sif (!list_empty (&afs_vfsmounts)) {mark_mounts_for_expiry (&afs_vfsmounts); -schedule_delayed_work (&afs_mntpt_expiry_timer, - afs_mntpt_expiry_timeout *HZ ); +queue_delayed_work (afs_wq, &afs_mntpt_expiry_timer, + afs_mntpt_expiry_timeout *HZ ); }_leave ("" );
@@ -309,6 +309,5 @@ void afs_mntpt_kill_timer(void)_enter ("" );ASSERT (list_empty (&afs_vfsmounts)); -cancel_delayed_work (&afs_mntpt_expiry_timer); -flush_scheduled_work (); +cancel_delayed_work_sync (&afs_mntpt_expiry_timer); }
fs/afs/rxrpc.c +1 -1
@@ -410,7 +410,7 @@ static void afs_rx_interceptor(struct soif (!call) {/* its an incoming call for our callback service */ skb_queue_tail (&afs_incoming_calls, skb); -schedule_work (&afs_collect_incoming_call_work); +queue_work (afs_wq, &afs_collect_incoming_call_work); }else {/* route the messages directly to the appropriate call */ skb_queue_tail (&call->rx_queue, skb);
fs/afs/server.c +7 -6
@@ -238,8 +238,8 @@ void afs_put_server(struct afs_server *sif (atomic_read (&server->usage) ==0 ) {list_move_tail (&server->grave, &afs_server_graveyard); server->time_of_death =get_seconds (); -schedule_delayed_work (&afs_server_reaper, - afs_server_timeout *HZ ); +queue_delayed_work (afs_wq, &afs_server_reaper, + afs_server_timeout *HZ ); }spin_unlock (&afs_server_graveyard_lock);_leave (" [dead]" );
@@ -285,10 +285,11 @@ static void afs_reap_server(struct work_ expiry = server->time_of_death + afs_server_timeout;if (expiry > now) { delay = (expiry - now) *HZ ; -if (!schedule_delayed_work (&afs_server_reaper, delay)) { +if (!queue_delayed_work (afs_wq, &afs_server_reaper, + delay)) {cancel_delayed_work (&afs_server_reaper); -schedule_delayed_work (&afs_server_reaper, - delay); +queue_delayed_work (afs_wq, &afs_server_reaper, + delay); }break ; }
@@ -323,5 +324,5 @@ void __exit afs_purge_servers(void) { afs_server_timeout =0 ;cancel_delayed_work (&afs_server_reaper); -schedule_delayed_work (&afs_server_reaper,0 ); +queue_delayed_work (afs_wq, &afs_server_reaper,0 ); }
fs/afs/vlocation.c +7 -7
@@ -507,8 +507,8 @@ void afs_put_vlocation(struct afs_vlocat_debug ("buried" );list_move_tail (&vl->grave, &afs_vlocation_graveyard); vl->time_of_death =get_seconds (); -schedule_delayed_work (&afs_vlocation_reap, - afs_vlocation_timeout *HZ ); +queue_delayed_work (afs_wq, &afs_vlocation_reap, + afs_vlocation_timeout *HZ );/* suspend updates on this record */ if (!list_empty (&vl->update)) {
@@ -561,11 +561,11 @@ static void afs_vlocation_reaper(structif (expiry > now) { delay = (expiry - now) *HZ ;_debug ("delay %lu" , delay); -if (!schedule_delayed_work (&afs_vlocation_reap, - delay)) { +if (!queue_delayed_work (afs_wq, &afs_vlocation_reap, + delay)) {cancel_delayed_work (&afs_vlocation_reap); -schedule_delayed_work (&afs_vlocation_reap, - delay); +queue_delayed_work (afs_wq, &afs_vlocation_reap, + delay); }break ; }
@@ -620,7 +620,7 @@ void afs_vlocation_purge(void)destroy_workqueue (afs_vlocation_update_worker);cancel_delayed_work (&afs_vlocation_reap); -schedule_delayed_work (&afs_vlocation_reap,0 ); +queue_delayed_work (afs_wq, &afs_vlocation_reap,0 ); }/*
David Howells
maintainerIs that going away in the next merge window?
David
Hello, David.
Quoted 1 line · David Howells
Is that going away in the next merge window?
Probably not that soon. I'm thinking about marking it deprecated in the next merge window.
Thanks.
Signature · 1 line
tejun