inet: frags: refactor ipfrag_init()

edumazet · davem330 · commit 483a6e4fa055 · 2018-03-31T23:25:38.000-04:00
We need to call inet_frags_init() before register_pernet_subsys(),
as a prereq for following patch ("inet: frags: use rhashtables for reassembly units")

Signed-off-by: Eric Dumazet &lt;edumazet@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
@@ -896,8 +896,6 @@ static struct pernet_operations ip4_frags_ops = {
 
 void __init ipfrag_init(void)
 {
-	ip4_frags_ctl_register();
-	register_pernet_subsys(&ip4_frags_ops);
 	ip4_frags.hashfn = ip4_hashfn;
 	ip4_frags.constructor = ip4_frag_init;
 	ip4_frags.destructor = ip4_frag_free;
@@ -907,4 +905,6 @@ void __init ipfrag_init(void)
 	ip4_frags.frags_cache_name = ip_frag_cache_name;
 	if (inet_frags_init(&ip4_frags))
 		panic("IP: failed to allocate ip4_frags cache\n");
+	ip4_frags_ctl_register();
+	register_pernet_subsys(&ip4_frags_ops);
 }

Original file line number	Diff line number	Diff line change
`@@ -896,8 +896,6 @@ static struct pernet_operations ip4_frags_ops = {`
`896`	`896`
`897`	`897`	`void __init ipfrag_init(void)`
`898`	`898`	`{`
`899`		`- ip4_frags_ctl_register();`
`900`		`- register_pernet_subsys(&ip4_frags_ops);`
`901`	`899`	`ip4_frags.hashfn = ip4_hashfn;`
`902`	`900`	`ip4_frags.constructor = ip4_frag_init;`
`903`	`901`	`ip4_frags.destructor = ip4_frag_free;`
`@@ -907,4 +905,6 @@ void __init ipfrag_init(void)`
`907`	`905`	`ip4_frags.frags_cache_name = ip_frag_cache_name;`
`908`	`906`	`if (inet_frags_init(&ip4_frags))`
`909`	`907`	`panic("IP: failed to allocate ip4_frags cache\n");`
	`908`	`+ ip4_frags_ctl_register();`
	`909`	`+ register_pernet_subsys(&ip4_frags_ops);`
`910`	`910`	`}`