forked from Minki/linux
inet: frags: change inet_frags_init_net() return value
We will soon initialize one rhashtable per struct netns_frags in inet_frags_init_net(). This patch changes the return value to eventually propagate an error. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c22af22cbd
commit
787bea7748
@ -104,9 +104,10 @@ struct inet_frags {
|
|||||||
int inet_frags_init(struct inet_frags *);
|
int inet_frags_init(struct inet_frags *);
|
||||||
void inet_frags_fini(struct inet_frags *);
|
void inet_frags_fini(struct inet_frags *);
|
||||||
|
|
||||||
static inline void inet_frags_init_net(struct netns_frags *nf)
|
static inline int inet_frags_init_net(struct netns_frags *nf)
|
||||||
{
|
{
|
||||||
atomic_set(&nf->mem, 0);
|
atomic_set(&nf->mem, 0);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f);
|
void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f);
|
||||||
|
|
||||||
|
@ -581,14 +581,19 @@ static int __net_init lowpan_frags_init_net(struct net *net)
|
|||||||
{
|
{
|
||||||
struct netns_ieee802154_lowpan *ieee802154_lowpan =
|
struct netns_ieee802154_lowpan *ieee802154_lowpan =
|
||||||
net_ieee802154_lowpan(net);
|
net_ieee802154_lowpan(net);
|
||||||
|
int res;
|
||||||
|
|
||||||
ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
|
ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
|
||||||
ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH;
|
ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH;
|
||||||
ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT;
|
ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT;
|
||||||
|
|
||||||
inet_frags_init_net(&ieee802154_lowpan->frags);
|
res = inet_frags_init_net(&ieee802154_lowpan->frags);
|
||||||
|
if (res < 0)
|
||||||
return lowpan_frags_ns_sysctl_register(net);
|
return res;
|
||||||
|
res = lowpan_frags_ns_sysctl_register(net);
|
||||||
|
if (res < 0)
|
||||||
|
inet_frags_exit_net(&ieee802154_lowpan->frags, &lowpan_frags);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __net_exit lowpan_frags_exit_net(struct net *net)
|
static void __net_exit lowpan_frags_exit_net(struct net *net)
|
||||||
|
@ -846,6 +846,8 @@ static void __init ip4_frags_ctl_register(void)
|
|||||||
|
|
||||||
static int __net_init ipv4_frags_init_net(struct net *net)
|
static int __net_init ipv4_frags_init_net(struct net *net)
|
||||||
{
|
{
|
||||||
|
int res;
|
||||||
|
|
||||||
/* Fragment cache limits.
|
/* Fragment cache limits.
|
||||||
*
|
*
|
||||||
* The fragment memory accounting code, (tries to) account for
|
* The fragment memory accounting code, (tries to) account for
|
||||||
@ -871,9 +873,13 @@ static int __net_init ipv4_frags_init_net(struct net *net)
|
|||||||
|
|
||||||
net->ipv4.frags.max_dist = 64;
|
net->ipv4.frags.max_dist = 64;
|
||||||
|
|
||||||
inet_frags_init_net(&net->ipv4.frags);
|
res = inet_frags_init_net(&net->ipv4.frags);
|
||||||
|
if (res < 0)
|
||||||
return ip4_frags_ns_ctl_register(net);
|
return res;
|
||||||
|
res = ip4_frags_ns_ctl_register(net);
|
||||||
|
if (res < 0)
|
||||||
|
inet_frags_exit_net(&net->ipv4.frags, &ip4_frags);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __net_exit ipv4_frags_exit_net(struct net *net)
|
static void __net_exit ipv4_frags_exit_net(struct net *net)
|
||||||
|
@ -629,12 +629,18 @@ EXPORT_SYMBOL_GPL(nf_ct_frag6_gather);
|
|||||||
|
|
||||||
static int nf_ct_net_init(struct net *net)
|
static int nf_ct_net_init(struct net *net)
|
||||||
{
|
{
|
||||||
|
int res;
|
||||||
|
|
||||||
net->nf_frag.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
|
net->nf_frag.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
|
||||||
net->nf_frag.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
|
net->nf_frag.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
|
||||||
net->nf_frag.frags.timeout = IPV6_FRAG_TIMEOUT;
|
net->nf_frag.frags.timeout = IPV6_FRAG_TIMEOUT;
|
||||||
inet_frags_init_net(&net->nf_frag.frags);
|
res = inet_frags_init_net(&net->nf_frag.frags);
|
||||||
|
if (res < 0)
|
||||||
return nf_ct_frag6_sysctl_register(net);
|
return res;
|
||||||
|
res = nf_ct_frag6_sysctl_register(net);
|
||||||
|
if (res < 0)
|
||||||
|
inet_frags_exit_net(&net->nf_frag.frags, &nf_frags);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void nf_ct_net_exit(struct net *net)
|
static void nf_ct_net_exit(struct net *net)
|
||||||
|
@ -711,13 +711,20 @@ static void ip6_frags_sysctl_unregister(void)
|
|||||||
|
|
||||||
static int __net_init ipv6_frags_init_net(struct net *net)
|
static int __net_init ipv6_frags_init_net(struct net *net)
|
||||||
{
|
{
|
||||||
|
int res;
|
||||||
|
|
||||||
net->ipv6.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
|
net->ipv6.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
|
||||||
net->ipv6.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
|
net->ipv6.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
|
||||||
net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT;
|
net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT;
|
||||||
|
|
||||||
inet_frags_init_net(&net->ipv6.frags);
|
res = inet_frags_init_net(&net->ipv6.frags);
|
||||||
|
if (res < 0)
|
||||||
|
return res;
|
||||||
|
|
||||||
return ip6_frags_ns_sysctl_register(net);
|
res = ip6_frags_ns_sysctl_register(net);
|
||||||
|
if (res < 0)
|
||||||
|
inet_frags_exit_net(&net->ipv6.frags, &ip6_frags);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __net_exit ipv6_frags_exit_net(struct net *net)
|
static void __net_exit ipv6_frags_exit_net(struct net *net)
|
||||||
|
Loading…
Reference in New Issue
Block a user