Commit 9cfdd75b authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Remove skb_sknet 



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

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 7c6c21ee

include/net/ip_vs.h

+0 −22
Original line number Diff line number Diff line
@@ -38,28 +38,6 @@ static inline struct netns_ipvs *net_ipvs(struct net* net) 
	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

 * private not as a struct i.e. seq_file_net can't be used.

 */

net/netfilter/ipvs/ip_vs_ctl.c

+10 −15
Original line number Diff line number Diff line
@@ -3002,7 +3002,8 @@ static int ip_vs_genl_dump_services(struct sk_buff *skb, 
	int idx = 0, i;

	int start = cb->args[0];

	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);

	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_dest *dest;

	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);



	mutex_lock(&__ip_vs_mutex);
@@ -3348,7 +3349,7 @@ static int ip_vs_genl_dump_daemon(struct sk_buff *skb, __u32 state, 
static int ip_vs_genl_dump_daemons(struct sk_buff *skb,

				   struct netlink_callback *cb)

{

	struct net *net = skb_sknet(skb);

	struct net *net = sock_net(skb->sk);

	struct netns_ipvs *ipvs = net_ipvs(net);



	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)

{

	int ret = -EINVAL, cmd;

	struct net *net;

	struct netns_ipvs *ipvs;

	struct net *net = sock_net(skb->sk);

	struct netns_ipvs *ipvs = net_ipvs(net);



	net = skb_sknet(skb);

	ipvs = net_ipvs(net);

	cmd = info->genlhdr->cmd;



	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;

	int ret = 0, cmd;

	int need_full_svc = 0, need_full_dest = 0;

	struct net *net;

	struct netns_ipvs *ipvs;

	struct net *net = sock_net(skb->sk);

	struct netns_ipvs *ipvs = net_ipvs(net);



	net = skb_sknet(skb);

	ipvs = net_ipvs(net);

	cmd = info->genlhdr->cmd;



	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;

	void *reply;

	int ret, cmd, reply_cmd;

	struct net *net;

	struct netns_ipvs *ipvs;

	struct net *net = sock_net(skb->sk);

	struct netns_ipvs *ipvs = net_ipvs(net);



	net = skb_sknet(skb);

	ipvs = net_ipvs(net);

	cmd = info->genlhdr->cmd;



	if (cmd == IPVS_CMD_GET_SERVICE)