[PATCH resend] net: use printk_once
From: Marcin Slusarz <hidden>
Date: 2009-08-23 18:29:48
Also in:
lkml
Subsystem:
netfilter, networking [dsa], networking [general], networking [sockets], the rest · Maintainers:
Pablo Neira Ayuso, Florian Westphal, Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Willem de Bruijn, Linus Torvalds
From: Marcin Slusarz <redacted> Subject: net: use printk_once Signed-off-by: Marcin Slusarz <redacted> Acked-by: David S. Miller <davem@davemloft.net> Cc: netdev@vger.kernel.org
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index da0f64f..39c895b 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c@@ -1792,12 +1792,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) /* old structure? */ if (cmd == SIOCAX25GETINFOOLD) { - static int warned = 0; - if (!warned) { - printk(KERN_INFO "%s uses old SIOCAX25GETINFO\n", + printk_once(KERN_INFO "%s uses old SIOCAX25GETINFO\n", current->comm); - warned=1; - } if (copy_to_user(argp, &ax25_info, sizeof(struct ax25_info_struct_deprecated))) { res = -EFAULT;
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 71489f6..ecd2dfb 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c@@ -302,14 +302,12 @@ static struct net_device *dev_to_net_device(struct device *dev) static int dsa_probe(struct platform_device *pdev) { - static int dsa_version_printed; struct dsa_platform_data *pd = pdev->dev.platform_data; struct net_device *dev; struct dsa_switch_tree *dst; int i; - if (!dsa_version_printed++) - printk(KERN_NOTICE "Distributed Switch Architecture " + printk_once(KERN_NOTICE "Distributed Switch Architecture " "driver version %s\n", dsa_driver_version); if (pd == NULL || pd->netdev == NULL)
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 2979f14..f919925 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c@@ -470,10 +470,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, if (msg->msg_namelen < sizeof(*usin)) goto out; if (usin->sin_family != AF_INET) { - static int complained; - if (!complained++) - printk(KERN_INFO "%s forgot to set AF_INET in " - "raw sendmsg. Fix it!\n", + printk_once(KERN_INFO "%s forgot to set AF_INET in " + "raw sendmsg. Fix it!\n", current->comm); err = -EAFNOSUPPORT; if (usin->sin_family)
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index eb0ceb8..d60d317 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c@@ -456,13 +456,9 @@ static int recent_seq_open(struct inode *inode, struct file *file) #ifdef CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT static int recent_old_seq_open(struct inode *inode, struct file *filp) { - static bool warned_of_old; - - if (unlikely(!warned_of_old)) { - printk(KERN_INFO KBUILD_MODNAME ": Use of /proc/net/ipt_recent" - " is deprecated; use /proc/net/xt_recent.\n"); - warned_of_old = true; - } + printk_once(KERN_INFO KBUILD_MODNAME ": " + "Use of /proc/net/ipt_recent is deprecated; " + "use /proc/net/xt_recent.\n"); return recent_seq_open(inode, filp); }
diff --git a/net/socket.c b/net/socket.c
index 791d71a..1d07f69 100644
--- a/net/socket.c
+++ b/net/socket.c@@ -1161,12 +1161,8 @@ static int __sock_create(struct net *net, int family, int type, int protocol, deadlock in module load. */ if (family == PF_INET && type == SOCK_PACKET) { - static int warned; - if (!warned) { - warned = 1; - printk(KERN_INFO "%s uses obsolete (PF_INET,SOCK_PACKET)\n", - current->comm); - } + printk_once(KERN_INFO "%s uses obsolete (PF_INET,SOCK_PACKET)\n", + current->comm); family = PF_PACKET; }