xfrm: initialise xfrm_policy_gc_work statically

Alexey Dobriyan · davem330 · commit c95839693d2a · 2008-11-25T17:13:59.000-08:00
Signed-off-by: Alexey Dobriyan &lt;adobriyan@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
@@ -55,7 +55,6 @@ static struct xfrm_policy_afinfo *xfrm_policy_afinfo[NPROTO];
 
 static struct kmem_cache *xfrm_dst_cache __read_mostly;
 
-static struct work_struct xfrm_policy_gc_work;
 static HLIST_HEAD(xfrm_policy_gc_list);
 static DEFINE_SPINLOCK(xfrm_policy_gc_lock);
 
@@ -296,6 +295,7 @@ static void xfrm_policy_gc_task(struct work_struct *work)
 	hlist_for_each_entry_safe(policy, entry, tmp, &gc_list, bydst)
 		xfrm_policy_gc_kill(policy);
 }
+static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task);
 
 /* Rule must be locked. Release descentant resources, announce
  * entry dead. The rule must be unlinked from lists to the moment.
@@ -2425,7 +2425,6 @@ static void __init xfrm_policy_init(void)
 	}
 
 	INIT_LIST_HEAD(&xfrm_policy_all);
-	INIT_WORK(&xfrm_policy_gc_work, xfrm_policy_gc_task);
 	register_netdevice_notifier(&xfrm_dev_notifier);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ static struct xfrm_policy_afinfo *xfrm_policy_afinfo[NPROTO];`
`55`	`55`
`56`	`56`	`static struct kmem_cache *xfrm_dst_cache __read_mostly;`
`57`	`57`
`58`		`-static struct work_struct xfrm_policy_gc_work;`
`59`	`58`	`static HLIST_HEAD(xfrm_policy_gc_list);`
`60`	`59`	`static DEFINE_SPINLOCK(xfrm_policy_gc_lock);`
`61`	`60`
`@@ -296,6 +295,7 @@ static void xfrm_policy_gc_task(struct work_struct *work)`
`296`	`295`	`hlist_for_each_entry_safe(policy, entry, tmp, &gc_list, bydst)`
`297`	`296`	`xfrm_policy_gc_kill(policy);`
`298`	`297`	`}`
	`298`	`+static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task);`
`299`	`299`
`300`	`300`	`/* Rule must be locked. Release descentant resources, announce`
`301`	`301`	`* entry dead. The rule must be unlinked from lists to the moment.`
`@@ -2425,7 +2425,6 @@ static void __init xfrm_policy_init(void)`
`2425`	`2425`	`}`
`2426`	`2426`
`2427`	`2427`	`INIT_LIST_HEAD(&xfrm_policy_all);`
`2428`		`- INIT_WORK(&xfrm_policy_gc_work, xfrm_policy_gc_task);`
`2429`	`2428`	`register_netdevice_notifier(&xfrm_dev_notifier);`
`2430`	`2429`	`}`
`2431`	`2430`