Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e3e238e authored by Hannes Eder's avatar Hannes Eder Committed by David S. Miller
Browse files

IPVS: use pr_err and friends instead of IP_VS_ERR and friends 



Since pr_err and friends are used instead of printk there is no point
in keeping IP_VS_ERR and friends.  Furthermore make use of '__func__'
instead of hard coded function names.

Signed-off-by: default avatarHannes Eder <heder@google.com>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bcd218be

include/net/ip_vs.h

+2 −5
Original line number Diff line number Diff line
@@ -150,13 +150,10 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, 
#endif



#define IP_VS_BUG() BUG()

#define IP_VS_ERR(msg...) pr_err(msg)

#define IP_VS_INFO(msg...) pr_info(msg)

#define IP_VS_WARNING(msg...) pr_warning(msg)

#define IP_VS_ERR_RL(msg...)						\

#define IP_VS_ERR_RL(msg, ...)						\

	do {								\

		if (net_ratelimit())					\

			pr_err(msg);					\

			pr_err(msg, ##__VA_ARGS__);			\

	} while (0)



#ifdef CONFIG_IP_VS_DEBUG

net/netfilter/ipvs/ip_vs_app.c

+8 −8
Original line number Diff line number Diff line
@@ -265,12 +265,12 @@ static inline void vs_fix_seq(const struct ip_vs_seq *vseq, struct tcphdr *th) 
	if (vseq->delta || vseq->previous_delta) {

		if(after(seq, vseq->init_seq)) {

			th->seq = htonl(seq + vseq->delta);

			IP_VS_DBG(9, "vs_fix_seq(): added delta (%d) to seq\n",

				  vseq->delta);

			IP_VS_DBG(9, "%s(): added delta (%d) to seq\n",

				  __func__, vseq->delta);

		} else {

			th->seq = htonl(seq + vseq->previous_delta);

			IP_VS_DBG(9, "vs_fix_seq(): added previous_delta "

				  "(%d) to seq\n", vseq->previous_delta);

			IP_VS_DBG(9, "%s(): added previous_delta (%d) to seq\n",

				  __func__, vseq->previous_delta);

		}

	}

}
@@ -294,14 +294,14 @@ vs_fix_ack_seq(const struct ip_vs_seq *vseq, struct tcphdr *th) 
		   to receive next, so compare it with init_seq+delta */

		if(after(ack_seq, vseq->init_seq+vseq->delta)) {

			th->ack_seq = htonl(ack_seq - vseq->delta);

			IP_VS_DBG(9, "vs_fix_ack_seq(): subtracted delta "

				  "(%d) from ack_seq\n", vseq->delta);

			IP_VS_DBG(9, "%s(): subtracted delta "

				  "(%d) from ack_seq\n", __func__, vseq->delta);



		} else {

			th->ack_seq = htonl(ack_seq - vseq->previous_delta);

			IP_VS_DBG(9, "vs_fix_ack_seq(): subtracted "

			IP_VS_DBG(9, "%s(): subtracted "

				  "previous_delta (%d) from ack_seq\n",

				  vseq->previous_delta);

				  __func__, vseq->previous_delta);

		}

	}

}

net/netfilter/ipvs/ip_vs_conn.c

+7 −7
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ static inline int ip_vs_conn_hash(struct ip_vs_conn *cp) 
		atomic_inc(&cp->refcnt);

		ret = 1;

	} else {

		IP_VS_ERR("ip_vs_conn_hash(): request for already hashed, "

			  "called from %p\n", __builtin_return_address(0));

		pr_err("%s(): request for already hashed, called from %pF\n",

		       __func__, __builtin_return_address(0));

		ret = 0;

	}
@@ -692,7 +692,7 @@ ip_vs_conn_new(int af, int proto, const union nf_inet_addr *caddr, __be16 cport, 


	cp = kmem_cache_zalloc(ip_vs_conn_cachep, GFP_ATOMIC);

	if (cp == NULL) {

		IP_VS_ERR_RL("ip_vs_conn_new: no memory available.\n");

		IP_VS_ERR_RL("%s(): no memory\n", __func__);

		return NULL;

	}
@@ -1076,7 +1076,7 @@ int __init ip_vs_conn_init(void) 
		return -ENOMEM;

	}



	IP_VS_INFO("Connection hash table configured "

	pr_info("Connection hash table configured "

		"(size=%d, memory=%ldKbytes)\n",

		IP_VS_CONN_TAB_SIZE,

		(long)(IP_VS_CONN_TAB_SIZE*sizeof(struct list_head))/1024);

net/netfilter/ipvs/ip_vs_core.c

+12 −12
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ ip_vs_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	 */

	if (!svc->fwmark && pptr[1] != svc->port) {

		if (!svc->port)

			IP_VS_ERR("Schedule: port zero only supported "

			pr_err("Schedule: port zero only supported "

			       "in persistent services, "

			       "check your ipvs configuration\n");

		return NULL;
@@ -465,7 +465,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 
		ip_vs_service_put(svc);



		/* create a new connection entry */

		IP_VS_DBG(6, "ip_vs_leave: create a cache_bypass entry\n");

		IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);

		cp = ip_vs_conn_new(svc->af, iph.protocol,

				    &iph.saddr, pptr[0],

				    &iph.daddr, pptr[1],
@@ -667,7 +667,7 @@ static int handle_response_icmp(int af, struct sk_buff *skb, 
	unsigned int verdict = NF_DROP;



	if (IP_VS_FWD_METHOD(cp) != 0) {

		IP_VS_ERR("shouldn't reach here, because the box is on the "

		pr_err("shouldn't reach here, because the box is on the "

		       "half connection in the tun/dr module.\n");

	}
@@ -1490,7 +1490,7 @@ static int __init ip_vs_init(void) 


	ret = ip_vs_control_init();

	if (ret < 0) {

		IP_VS_ERR("can't setup control.\n");

		pr_err("can't setup control.\n");

		goto cleanup_estimator;

	}
@@ -1498,23 +1498,23 @@ static int __init ip_vs_init(void) 


	ret = ip_vs_app_init();

	if (ret < 0) {

		IP_VS_ERR("can't setup application helper.\n");

		pr_err("can't setup application helper.\n");

		goto cleanup_protocol;

	}



	ret = ip_vs_conn_init();

	if (ret < 0) {

		IP_VS_ERR("can't setup connection table.\n");

		pr_err("can't setup connection table.\n");

		goto cleanup_app;

	}



	ret = nf_register_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));

	if (ret < 0) {

		IP_VS_ERR("can't register hooks.\n");

		pr_err("can't register hooks.\n");

		goto cleanup_conn;

	}



	IP_VS_INFO("ipvs loaded.\n");

	pr_info("ipvs loaded.\n");

	return ret;



  cleanup_conn:
@@ -1537,7 +1537,7 @@ static void __exit ip_vs_cleanup(void) 
	ip_vs_protocol_cleanup();

	ip_vs_control_cleanup();

	ip_vs_estimator_cleanup();

	IP_VS_INFO("ipvs unloaded.\n");

	pr_info("ipvs unloaded.\n");

}



module_init(ip_vs_init);

net/netfilter/ipvs/ip_vs_ctl.c

+30 −32
Original line number Diff line number Diff line
@@ -343,8 +343,8 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc) 
	unsigned hash;



	if (svc->flags & IP_VS_SVC_F_HASHED) {

		IP_VS_ERR("ip_vs_svc_hash(): request for already hashed, "

			  "called from %p\n", __builtin_return_address(0));

		pr_err("%s(): request for already hashed, called from %pF\n",

		       __func__, __builtin_return_address(0));

		return 0;

	}
@@ -377,8 +377,8 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc) 
static int ip_vs_svc_unhash(struct ip_vs_service *svc)

{

	if (!(svc->flags & IP_VS_SVC_F_HASHED)) {

		IP_VS_ERR("ip_vs_svc_unhash(): request for unhash flagged, "

			  "called from %p\n", __builtin_return_address(0));

		pr_err("%s(): request for unhash flagged, called from %pF\n",

		       __func__, __builtin_return_address(0));

		return 0;

	}
@@ -844,7 +844,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, 


	dest = kzalloc(sizeof(struct ip_vs_dest), GFP_ATOMIC);

	if (dest == NULL) {

		IP_VS_ERR("ip_vs_new_dest: kmalloc failed.\n");

		pr_err("%s(): no memory.\n", __func__);

		return -ENOMEM;

	}
@@ -888,13 +888,13 @@ ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) 
	EnterFunction(2);



	if (udest->weight < 0) {

		IP_VS_ERR("ip_vs_add_dest(): server weight less than zero\n");

		pr_err("%s(): server weight less than zero\n", __func__);

		return -ERANGE;

	}



	if (udest->l_threshold > udest->u_threshold) {

		IP_VS_ERR("ip_vs_add_dest(): lower threshold is higher than "

			  "upper threshold\n");

		pr_err("%s(): lower threshold is higher than upper threshold\n",

			__func__);

		return -ERANGE;

	}
@@ -906,7 +906,7 @@ ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) 
	dest = ip_vs_lookup_dest(svc, &daddr, dport);



	if (dest != NULL) {

		IP_VS_DBG(1, "ip_vs_add_dest(): dest already exists\n");

		IP_VS_DBG(1, "%s(): dest already exists\n", __func__);

		return -EEXIST;

	}
@@ -1000,13 +1000,13 @@ ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) 
	EnterFunction(2);



	if (udest->weight < 0) {

		IP_VS_ERR("ip_vs_edit_dest(): server weight less than zero\n");

		pr_err("%s(): server weight less than zero\n", __func__);

		return -ERANGE;

	}



	if (udest->l_threshold > udest->u_threshold) {

		IP_VS_ERR("ip_vs_edit_dest(): lower threshold is higher than "

			  "upper threshold\n");

		pr_err("%s(): lower threshold is higher than upper threshold\n",

			__func__);

		return -ERANGE;

	}
@@ -1018,7 +1018,7 @@ ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) 
	dest = ip_vs_lookup_dest(svc, &daddr, dport);



	if (dest == NULL) {

		IP_VS_DBG(1, "ip_vs_edit_dest(): dest doesn't exist\n");

		IP_VS_DBG(1, "%s(): dest doesn't exist\n", __func__);

		return -ENOENT;

	}
@@ -1118,7 +1118,7 @@ ip_vs_del_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) 
	dest = ip_vs_lookup_dest(svc, &udest->addr, dport);



	if (dest == NULL) {

		IP_VS_DBG(1, "ip_vs_del_dest(): destination not found!\n");

		IP_VS_DBG(1, "%s(): destination not found!\n", __func__);

		return -ENOENT;

	}
@@ -1164,8 +1164,7 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u, 
	/* Lookup the scheduler by 'u->sched_name' */

	sched = ip_vs_scheduler_get(u->sched_name);

	if (sched == NULL) {

		IP_VS_INFO("Scheduler module ip_vs_%s not found\n",

			   u->sched_name);

		pr_info("Scheduler module ip_vs_%s not found\n", u->sched_name);

		ret = -ENOENT;

		goto out_mod_dec;

	}
@@ -1179,7 +1178,7 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u, 


	svc = kzalloc(sizeof(struct ip_vs_service), GFP_ATOMIC);

	if (svc == NULL) {

		IP_VS_DBG(1, "ip_vs_add_service: kmalloc failed.\n");

		IP_VS_DBG(1, "%s(): no memory\n", __func__);

		ret = -ENOMEM;

		goto out_err;

	}
@@ -1262,8 +1261,7 @@ ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u) 
	 */

	sched = ip_vs_scheduler_get(u->sched_name);

	if (sched == NULL) {

		IP_VS_INFO("Scheduler module ip_vs_%s not found\n",

			   u->sched_name);

		pr_info("Scheduler module ip_vs_%s not found\n", u->sched_name);

		return -ENOENT;

	}

	old_sched = sched;
@@ -2080,7 +2078,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) 
		return -EPERM;



	if (len != set_arglen[SET_CMDID(cmd)]) {

		IP_VS_ERR("set_ctl: len %u != %u\n",

		pr_err("set_ctl: len %u != %u\n",

		       len, set_arglen[SET_CMDID(cmd)]);

		return -EINVAL;

	}
@@ -2132,7 +2130,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) 


	/* Check for valid protocol: TCP or UDP, even for fwmark!=0 */

	if (usvc.protocol != IPPROTO_TCP && usvc.protocol != IPPROTO_UDP) {

		IP_VS_ERR("set_ctl: invalid protocol: %d %pI4:%d %s\n",

		pr_err("set_ctl: invalid protocol: %d %pI4:%d %s\n",

		       usvc.protocol, &usvc.addr.ip,

		       ntohs(usvc.port), usvc.sched_name);

		ret = -EFAULT;
@@ -2359,7 +2357,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) 
		return -EPERM;



	if (*len < get_arglen[GET_CMDID(cmd)]) {

		IP_VS_ERR("get_ctl: len %u < %u\n",

		pr_err("get_ctl: len %u < %u\n",

		       *len, get_arglen[GET_CMDID(cmd)]);

		return -EINVAL;

	}
@@ -2405,7 +2403,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) 
		size = sizeof(*get) +

			sizeof(struct ip_vs_service_entry) * get->num_services;

		if (*len != size) {

			IP_VS_ERR("length: %u != %u\n", *len, size);

			pr_err("length: %u != %u\n", *len, size);

			ret = -EINVAL;

			goto out;

		}
@@ -2445,7 +2443,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) 
		size = sizeof(*get) +

			sizeof(struct ip_vs_dest_entry) * get->num_dests;

		if (*len != size) {

			IP_VS_ERR("length: %u != %u\n", *len, size);

			pr_err("length: %u != %u\n", *len, size);

			ret = -EINVAL;

			goto out;

		}
@@ -3173,7 +3171,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info) 
	else if (cmd == IPVS_CMD_GET_CONFIG)

		reply_cmd = IPVS_CMD_SET_CONFIG;

	else {

		IP_VS_ERR("unknown Generic Netlink command\n");

		pr_err("unknown Generic Netlink command\n");

		return -EINVAL;

	}
@@ -3238,7 +3236,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info) 
	goto out;



nla_put_failure:

	IP_VS_ERR("not enough space in Netlink message\n");

	pr_err("not enough space in Netlink message\n");

	ret = -EMSGSIZE;



out_err:
@@ -3369,13 +3367,13 @@ int __init ip_vs_control_init(void) 


	ret = nf_register_sockopt(&ip_vs_sockopts);

	if (ret) {

		IP_VS_ERR("cannot register sockopt.\n");

		pr_err("cannot register sockopt.\n");

		return ret;

	}



	ret = ip_vs_genl_register();

	if (ret) {

		IP_VS_ERR("cannot register Generic Netlink interface.\n");

		pr_err("cannot register Generic Netlink interface.\n");

		nf_unregister_sockopt(&ip_vs_sockopts);

		return ret;

	}