evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipvs: Remove skb_sknet

Browse source 
This function adds no real value and it obscures what the code is doing.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:03:00 -05:00 • committed by Simon Horman
parent 7c6c21ee94
commit 9cfdd75b7c
2 changed files with 10 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/net/ip_vs.h
View file

@ -38,28 +38,6 @@ static inline struct netns_ipvs *net_ipvs(struct net* net)
return net->ipvs; return net->ipvs;
} }
static inline struct net *skb_sknet(const struct sk_buff *skb)
{
#ifdef CONFIG_NET_NS
#ifdef CONFIG_IP_VS_DEBUG
/* Start with the most likely hit */
if (likely(skb->sk && sock_net(skb->sk)))
return sock_net(skb->sk);
WARN(skb->dev, "Maybe skb_net should be used instead in %s() line:%d\n",
__func__, __LINE__);
if (likely(skb->dev && dev_net(skb->dev)))
return dev_net(skb->dev);
pr_err("There is no net ptr to find in the skb in %s() line:%d\n",
__func__, __LINE__);
BUG();
#else
return sock_net(skb->sk);
#endif
#else
return &init_net;
#endif
}
/* This one needed for single_open_net since net is stored directly in /* This one needed for single_open_net since net is stored directly in
* private not as a struct i.e. seq_file_net can't be used. * private not as a struct i.e. seq_file_net can't be used.
*/ */

25
net/netfilter/ipvs/ip_vs_ctl.c
View file

@ -3002,7 +3002,8 @@ static int ip_vs_genl_dump_services(struct sk_buff *skb,
int idx = 0, i; int idx = 0, i;
int start = cb->args[0]; int start = cb->args[0];
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct netns_ipvs *ipvs = net_ipvs(skb_sknet(skb)); struct net *net = sock_net(skb->sk);
struct netns_ipvs *ipvs = net_ipvs(net);
mutex_lock(&__ip_vs_mutex); mutex_lock(&__ip_vs_mutex);
for (i = 0; i < IP_VS_SVC_TAB_SIZE; i++) { for (i = 0; i < IP_VS_SVC_TAB_SIZE; i++) {
@ -3201,7 +3202,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb,
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct ip_vs_dest *dest; struct ip_vs_dest *dest;
struct nlattr *attrs[IPVS_CMD_ATTR_MAX + 1]; struct nlattr *attrs[IPVS_CMD_ATTR_MAX + 1];
struct net *net = skb_sknet(skb); struct net *net = sock_net(skb->sk);
struct netns_ipvs *ipvs = net_ipvs(net); struct netns_ipvs *ipvs = net_ipvs(net);
mutex_lock(&__ip_vs_mutex); mutex_lock(&__ip_vs_mutex);
@ -3348,7 +3349,7 @@ nla_put_failure:
static int ip_vs_genl_dump_daemons(struct sk_buff *skb, static int ip_vs_genl_dump_daemons(struct sk_buff *skb,
struct netlink_callback *cb) struct netlink_callback *cb)
{ {
struct net *net = skb_sknet(skb); struct net *net = sock_net(skb->sk);
struct netns_ipvs *ipvs = net_ipvs(net); struct netns_ipvs *ipvs = net_ipvs(net);
mutex_lock(&ipvs->sync_mutex); mutex_lock(&ipvs->sync_mutex);
@ -3475,11 +3476,9 @@ static int ip_vs_genl_set_config(struct netns_ipvs *ipvs, struct nlattr **attrs)
static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info) static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info)
{ {
int ret = -EINVAL, cmd; int ret = -EINVAL, cmd;
struct net *net; struct net *net = sock_net(skb->sk);
struct netns_ipvs *ipvs; struct netns_ipvs *ipvs = net_ipvs(net);
net = skb_sknet(skb);
ipvs = net_ipvs(net);
cmd = info->genlhdr->cmd; cmd = info->genlhdr->cmd;
if (cmd == IPVS_CMD_NEW_DAEMON || cmd == IPVS_CMD_DEL_DAEMON) { if (cmd == IPVS_CMD_NEW_DAEMON || cmd == IPVS_CMD_DEL_DAEMON) {
@ -3508,11 +3507,9 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)
struct ip_vs_dest_user_kern udest; struct ip_vs_dest_user_kern udest;
int ret = 0, cmd; int ret = 0, cmd;
int need_full_svc = 0, need_full_dest = 0; int need_full_svc = 0, need_full_dest = 0;
struct net *net; struct net *net = sock_net(skb->sk);
struct netns_ipvs *ipvs; struct netns_ipvs *ipvs = net_ipvs(net);
net = skb_sknet(skb);
ipvs = net_ipvs(net);
cmd = info->genlhdr->cmd; cmd = info->genlhdr->cmd;
mutex_lock(&__ip_vs_mutex); mutex_lock(&__ip_vs_mutex);
@ -3632,11 +3629,9 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info)
struct sk_buff *msg; struct sk_buff *msg;
void *reply; void *reply;
int ret, cmd, reply_cmd; int ret, cmd, reply_cmd;
struct net *net; struct net *net = sock_net(skb->sk);
struct netns_ipvs *ipvs; struct netns_ipvs *ipvs = net_ipvs(net);
net = skb_sknet(skb);
ipvs = net_ipvs(net);
cmd = info->genlhdr->cmd; cmd = info->genlhdr->cmd;
if (cmd == IPVS_CMD_GET_SERVICE) if (cmd == IPVS_CMD_GET_SERVICE)