Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9cfdd75b7c049895317aebb0e27f8112e7e31593

Authored by Eric W. Biederman
Committed by Simon Horman
1 parent 7c6c21ee94

ipvs: Remove skb_sknet 

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>

Showing 2 changed files with 10 additions and 37 deletions Side-by-side Diff

... ... @@ -38,28 +38,6 @@
38 38 return net->ipvs;
39 39 }
40 40  
41   -static inline struct net *skb_sknet(const struct sk_buff *skb)
42   -{
43   -#ifdef CONFIG_NET_NS
44   -#ifdef CONFIG_IP_VS_DEBUG
45   - /* Start with the most likely hit */
46   - if (likely(skb->sk && sock_net(skb->sk)))
47   - return sock_net(skb->sk);
48   - WARN(skb->dev, "Maybe skb_net should be used instead in %s() line:%d\n",
49   - __func__, __LINE__);
50   - if (likely(skb->dev && dev_net(skb->dev)))
51   - return dev_net(skb->dev);
52   - pr_err("There is no net ptr to find in the skb in %s() line:%d\n",
53   - __func__, __LINE__);
54   - BUG();
55   -#else
56   - return sock_net(skb->sk);
57   -#endif
58   -#else
59   - return &init_net;
60   -#endif
61   -}
62   -
63 41 /* This one needed for single_open_net since net is stored directly in
64 42 * private not as a struct i.e. seq_file_net can't be used.
65 43 */
net/netfilter/ipvs/ip_vs_ctl.c
Diff comments   View file @ 9cfdd75
... ... @@ -3002,7 +3002,8 @@
3002 3002 int idx = 0, i;
3003 3003 int start = cb->args[0];
3004 3004 struct ip_vs_service *svc;
3005   - struct netns_ipvs *ipvs = net_ipvs(skb_sknet(skb));
  3005 + struct net *net = sock_net(skb->sk);
  3006 + struct netns_ipvs *ipvs = net_ipvs(net);
3006 3007  
3007 3008 mutex_lock(&__ip_vs_mutex);
3008 3009 for (i = 0; i < IP_VS_SVC_TAB_SIZE; i++) {
... ... @@ -3201,7 +3202,7 @@
3201 3202 struct ip_vs_service *svc;
3202 3203 struct ip_vs_dest *dest;
3203 3204 struct nlattr *attrs[IPVS_CMD_ATTR_MAX + 1];
3204   - struct net *net = skb_sknet(skb);
  3205 + struct net *net = sock_net(skb->sk);
3205 3206 struct netns_ipvs *ipvs = net_ipvs(net);
3206 3207  
3207 3208 mutex_lock(&__ip_vs_mutex);
... ... @@ -3348,7 +3349,7 @@
3348 3349 static int ip_vs_genl_dump_daemons(struct sk_buff *skb,
3349 3350 struct netlink_callback *cb)
3350 3351 {
3351   - struct net *net = skb_sknet(skb);
  3352 + struct net *net = sock_net(skb->sk);
3352 3353 struct netns_ipvs *ipvs = net_ipvs(net);
3353 3354  
3354 3355 mutex_lock(&ipvs->sync_mutex);
3355 3356  
... ... @@ -3475,11 +3476,9 @@
3475 3476 static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info)
3476 3477 {
3477 3478 int ret = -EINVAL, cmd;
3478   - struct net *net;
3479   - struct netns_ipvs *ipvs;
  3479 + struct net *net = sock_net(skb->sk);
  3480 + struct netns_ipvs *ipvs = net_ipvs(net);
3480 3481  
3481   - net = skb_sknet(skb);
3482   - ipvs = net_ipvs(net);
3483 3482 cmd = info->genlhdr->cmd;
3484 3483  
3485 3484 if (cmd == IPVS_CMD_NEW_DAEMON || cmd == IPVS_CMD_DEL_DAEMON) {
3486 3485  
... ... @@ -3508,11 +3507,9 @@
3508 3507 struct ip_vs_dest_user_kern udest;
3509 3508 int ret = 0, cmd;
3510 3509 int need_full_svc = 0, need_full_dest = 0;
3511   - struct net *net;
3512   - struct netns_ipvs *ipvs;
  3510 + struct net *net = sock_net(skb->sk);
  3511 + struct netns_ipvs *ipvs = net_ipvs(net);
3513 3512  
3514   - net = skb_sknet(skb);
3515   - ipvs = net_ipvs(net);
3516 3513 cmd = info->genlhdr->cmd;
3517 3514  
3518 3515 mutex_lock(&__ip_vs_mutex);
3519 3516  
... ... @@ -3632,11 +3629,9 @@
3632 3629 struct sk_buff *msg;
3633 3630 void *reply;
3634 3631 int ret, cmd, reply_cmd;
3635   - struct net *net;
3636   - struct netns_ipvs *ipvs;
  3632 + struct net *net = sock_net(skb->sk);
  3633 + struct netns_ipvs *ipvs = net_ipvs(net);
3637 3634  
3638   - net = skb_sknet(skb);
3639   - ipvs = net_ipvs(net);
3640 3635 cmd = info->genlhdr->cmd;
3641 3636  
3642 3637 if (cmd == IPVS_CMD_GET_SERVICE)