From patchwork Sun Aug 23 18:29:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Slusarz X-Patchwork-Id: 31881 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 7F500B7257 for ; Mon, 24 Aug 2009 04:30:35 +1000 (EST) Received: by ozlabs.org (Postfix) id 72236DDD04; Mon, 24 Aug 2009 04:30:35 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 006AFDDD01 for ; Mon, 24 Aug 2009 04:30:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933712AbZHWS3s (ORCPT ); Sun, 23 Aug 2009 14:29:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933571AbZHWS3r (ORCPT ); Sun, 23 Aug 2009 14:29:47 -0400 Received: from mail-fx0-f217.google.com ([209.85.220.217]:49989 "EHLO mail-fx0-f217.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933329AbZHWS3q (ORCPT ); Sun, 23 Aug 2009 14:29:46 -0400 Received: by fxm17 with SMTP id 17so1152194fxm.37 for ; Sun, 23 Aug 2009 11:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=yhY7W/+qzIAeV7vTo2NAYUHcqHp9AP12ZxPi2plkK8Q=; b=ExOgsLs0AaQAnqgcu3Dp3K9tMU93v63PgB0ft7eIHlx/9TOBLWQiw/tWpfqmubF1K6 Rm/IA3nJFQdgrhcOakRNm0MiQQ9f3fJFYCDMxryRLnBnxubnoldFSDUAwnYBnDAJrll6 uWfXV0M83C83AX3/JFtSj8HBvjibPW6xvN/oQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=xeH21jinFyB3qE4w7I4fTSfmBEkXjjlE659EEBjOktkMwYF/JcAgugye9LX9EYjPoq RSv0DtZYKRMOrDtEngC0p0mMSZ6JALTawq8ZPkytusKSR+0ujc/suk86o2Df1GnwYpRO ScRYpb8VHAPOY0Si0a/wy8IfkOHjf0TV14mFs= Received: by 10.103.78.7 with SMTP id f7mr1437716mul.95.1251052186834; Sun, 23 Aug 2009 11:29:46 -0700 (PDT) Received: from ?192.168.1.104? (acet161.neoplus.adsl.tpnet.pl [83.9.195.161]) by mx.google.com with ESMTPS id j9sm18149812mue.56.2009.08.23.11.29.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 23 Aug 2009 11:29:46 -0700 (PDT) Message-ID: <4A918A99.4080909@gmail.com> Date: Sun, 23 Aug 2009 20:29:45 +0200 From: Marcin Slusarz User-Agent: Thunderbird 2.0.0.22 (X11/20090605) MIME-Version: 1.0 To: "David S. Miller" CC: netdev@vger.kernel.org, LKML , Andrew Morton Subject: [PATCH resend] net: use printk_once Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Marcin Slusarz Subject: net: use printk_once Signed-off-by: Marcin Slusarz Acked-by: David S. Miller Cc: netdev@vger.kernel.org --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }