IPVS: use pr_fmt (9aada7ac) · Commits · e / devices / android_kernel_oneplus_sm7250

include/net/ip_vs.h

+60 −59

Original line number	Original line	Diff line number	Diff line
	@@ -99,18 +99,18 @@ static inline const char ip_vs_dbg_addr(int af, char buf, size_t buf_len,
	return &buf[*idx - len];		return &buf[*idx - len];
	}		}

	#define IP_VS_DBG_BUF(level, msg...) \		#define IP_VS_DBG_BUF(level, msg, ...) \
	do { \		do { \
	char ip_vs_dbg_buf[160]; \		char ip_vs_dbg_buf[160]; \
	int ip_vs_dbg_idx = 0; \		int ip_vs_dbg_idx = 0; \
	if (level <= ip_vs_get_debug_level()) \		if (level <= ip_vs_get_debug_level()) \
	printk(KERN_DEBUG "IPVS: " msg); \		printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__); \
	} while (0)		} while (0)
	#define IP_VS_ERR_BUF(msg...) \		#define IP_VS_ERR_BUF(msg...) \
	do { \		do { \
	char ip_vs_dbg_buf[160]; \		char ip_vs_dbg_buf[160]; \
	int ip_vs_dbg_idx = 0; \		int ip_vs_dbg_idx = 0; \
	printk(KERN_ERR "IPVS: " msg); \		pr_err(msg); \
	} while (0)		} while (0)

	/* Only use from within IP_VS_DBG_BUF() or IP_VS_ERR_BUF macros */		/* Only use from within IP_VS_DBG_BUF() or IP_VS_ERR_BUF macros */
	@@ -119,15 +119,15 @@ static inline const char ip_vs_dbg_addr(int af, char buf, size_t buf_len,
	sizeof(ip_vs_dbg_buf), addr, \		sizeof(ip_vs_dbg_buf), addr, \
	&ip_vs_dbg_idx)		&ip_vs_dbg_idx)

	#define IP_VS_DBG(level, msg...) \		#define IP_VS_DBG(level, msg, ...) \
	do { \		do { \
	if (level <= ip_vs_get_debug_level()) \		if (level <= ip_vs_get_debug_level()) \
	printk(KERN_DEBUG "IPVS: " msg); \		printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__); \
	} while (0)		} while (0)
	#define IP_VS_DBG_RL(msg...) \		#define IP_VS_DBG_RL(msg, ...) \
	do { \		do { \
	if (net_ratelimit()) \		if (net_ratelimit()) \
	printk(KERN_DEBUG "IPVS: " msg); \		printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__); \
	} while (0)		} while (0)
	#define IP_VS_DBG_PKT(level, pp, skb, ofs, msg) \		#define IP_VS_DBG_PKT(level, pp, skb, ofs, msg) \
	do { \		do { \
	@@ -150,27 +150,28 @@ static inline const char ip_vs_dbg_addr(int af, char buf, size_t buf_len,
	#endif		#endif

	#define IP_VS_BUG() BUG()		#define IP_VS_BUG() BUG()
	#define IP_VS_ERR(msg...) printk(KERN_ERR "IPVS: " msg)		#define IP_VS_ERR(msg...) pr_err(msg)
	#define IP_VS_INFO(msg...) printk(KERN_INFO "IPVS: " msg)		#define IP_VS_INFO(msg...) pr_info(msg)
	#define IP_VS_WARNING(msg...) \		#define IP_VS_WARNING(msg...) pr_warning(msg)
	printk(KERN_WARNING "IPVS: " msg)
	#define IP_VS_ERR_RL(msg...) \		#define IP_VS_ERR_RL(msg...) \
	do { \		do { \
	if (net_ratelimit()) \		if (net_ratelimit()) \
	printk(KERN_ERR "IPVS: " msg); \		pr_err(msg); \
	} while (0)		} while (0)

	#ifdef CONFIG_IP_VS_DEBUG		#ifdef CONFIG_IP_VS_DEBUG
	#define EnterFunction(level) \		#define EnterFunction(level) \
	do { \		do { \
	if (level <= ip_vs_get_debug_level()) \		if (level <= ip_vs_get_debug_level()) \
	printk(KERN_DEBUG "Enter: %s, %s line %i\n", \		printk(KERN_DEBUG \
			pr_fmt("Enter: %s, %s line %i\n"), \
	__func__, __FILE__, __LINE__); \		__func__, __FILE__, __LINE__); \
	} while (0)		} while (0)
	#define LeaveFunction(level) \		#define LeaveFunction(level) \
	do { \		do { \
	if (level <= ip_vs_get_debug_level()) \		if (level <= ip_vs_get_debug_level()) \
	printk(KERN_DEBUG "Leave: %s, %s line %i\n", \		printk(KERN_DEBUG \
			pr_fmt("Leave: %s, %s line %i\n"), \
	__func__, __FILE__, __LINE__); \		__func__, __FILE__, __LINE__); \
	} while (0)		} while (0)
	#else		#else

net/netfilter/ipvs/ip_vs_app.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,9 @@
	*		*
	*/		*/

			#define KMSG_COMPONENT "IPVS"
			#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/skbuff.h>		#include <linux/skbuff.h>

net/netfilter/ipvs/ip_vs_conn.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,9 @@
	*		*
	*/		*/

			#define KMSG_COMPONENT "IPVS"
			#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/in.h>		#include <linux/in.h>
	#include <linux/net.h>		#include <linux/net.h>

net/netfilter/ipvs/ip_vs_core.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,9 @@
	*		*
	*/		*/

			#define KMSG_COMPONENT "IPVS"
			#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/ip.h>		#include <linux/ip.h>

net/netfilter/ipvs/ip_vs_ctl.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,9 @@
	*		*
	*/		*/

			#define KMSG_COMPONENT "IPVS"
			#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/types.h>		#include <linux/types.h>