diff options
author | Tejun Heo <tj@kernel.org> | 2012-08-21 16:18:23 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-08-21 16:18:23 -0400 |
commit | 203b42f7317494ae5e5efc7be6fb7f29c927f102 (patch) | |
tree | 5636bc6da58284977678e0d2c2accc2573260a53 /net | |
parent | ee64e7f697ad7e5575e6ac8900cfb71975484421 (diff) |
workqueue: make deferrable delayed_work initializer names consistent
Initalizers for deferrable delayed_work are confused.
* __DEFERRED_WORK_INITIALIZER()
* DECLARE_DEFERRED_WORK()
* INIT_DELAYED_WORK_DEFERRABLE()
Rename them to
* __DEFERRABLE_WORK_INITIALIZER()
* DECLARE_DEFERRABLE_WORK()
* INIT_DEFERRABLE_WORK()
This patch doesn't cause any functional changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/neighbour.c | 2 | ||||
-rw-r--r-- | net/ipv4/inetpeer.c | 2 | ||||
-rw-r--r-- | net/sunrpc/cache.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 117afaf5126..112c6e2266e 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -1545,7 +1545,7 @@ static void neigh_table_init_no_netlink(struct neigh_table *tbl) | |||
1545 | panic("cannot allocate neighbour cache hashes"); | 1545 | panic("cannot allocate neighbour cache hashes"); |
1546 | 1546 | ||
1547 | rwlock_init(&tbl->lock); | 1547 | rwlock_init(&tbl->lock); |
1548 | INIT_DELAYED_WORK_DEFERRABLE(&tbl->gc_work, neigh_periodic_work); | 1548 | INIT_DEFERRABLE_WORK(&tbl->gc_work, neigh_periodic_work); |
1549 | schedule_delayed_work(&tbl->gc_work, tbl->parms.reachable_time); | 1549 | schedule_delayed_work(&tbl->gc_work, tbl->parms.reachable_time); |
1550 | setup_timer(&tbl->proxy_timer, neigh_proxy_process, (unsigned long)tbl); | 1550 | setup_timer(&tbl->proxy_timer, neigh_proxy_process, (unsigned long)tbl); |
1551 | skb_queue_head_init_class(&tbl->proxy_queue, | 1551 | skb_queue_head_init_class(&tbl->proxy_queue, |
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index e1e0a4e8fd3..7b55c8648d4 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c | |||
@@ -194,7 +194,7 @@ void __init inet_initpeers(void) | |||
194 | 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, | 194 | 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, |
195 | NULL); | 195 | NULL); |
196 | 196 | ||
197 | INIT_DELAYED_WORK_DEFERRABLE(&gc_work, inetpeer_gc_worker); | 197 | INIT_DEFERRABLE_WORK(&gc_work, inetpeer_gc_worker); |
198 | } | 198 | } |
199 | 199 | ||
200 | static int addr_compare(const struct inetpeer_addr *a, | 200 | static int addr_compare(const struct inetpeer_addr *a, |
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 2afd2a84dc3..2a68bb3db77 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c | |||
@@ -1635,7 +1635,7 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net) | |||
1635 | 1635 | ||
1636 | void __init cache_initialize(void) | 1636 | void __init cache_initialize(void) |
1637 | { | 1637 | { |
1638 | INIT_DELAYED_WORK_DEFERRABLE(&cache_cleaner, do_cache_clean); | 1638 | INIT_DEFERRABLE_WORK(&cache_cleaner, do_cache_clean); |
1639 | } | 1639 | } |
1640 | 1640 | ||
1641 | int cache_register_net(struct cache_detail *cd, struct net *net) | 1641 | int cache_register_net(struct cache_detail *cd, struct net *net) |