From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Ricardo Leitner Subject: Re: [PATCH 3/3] Make use of pr_fmt where applicable Date: Fri, 24 Oct 2014 16:11:32 -0200 Message-ID: <544A9654.4060906@redhat.com> References: <12a99ae77aa9969692d847d8d2929deb13485e72.1414155204.git.mleitner@redhat.com> <5f048e55be367e1a29a34e72c29d5b6bba532d01.1414155204.git.mleitner@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit To: netfilter-devel@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:42822 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756140AbaJXSLe (ORCPT ); Fri, 24 Oct 2014 14:11:34 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9OIBY88016987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Oct 2014 14:11:34 -0400 Received: from localhost.localdomain (vpn1-6-186.gru2.redhat.com [10.97.6.186]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9OIBWqB025068 for ; Fri, 24 Oct 2014 14:11:33 -0400 In-Reply-To: <5f048e55be367e1a29a34e72c29d5b6bba532d01.1414155204.git.mleitner@redhat.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: On 24-10-2014 10:59, Marcelo Ricardo Leitner wrote: > And also remove PRINTR macro, as it was used only once, wasn't helping > much and was actually making it harder to use pr_err(). > > Signed-off-by: Marcelo Ricardo Leitner > --- > net/netfilter/nfnetlink_log.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c > index b1e3a05794169283ed50d1c0fb4f44d9e7753eeb..1c6c970e5d1baa5517c5589bd52345d0ae971c1a 100644 > --- a/net/netfilter/nfnetlink_log.c > +++ b/net/netfilter/nfnetlink_log.c > @@ -12,6 +12,8 @@ > * it under the terms of the GNU General Public License version 2 as > * published by the Free Software Foundation. > */ > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > + > #include > #include > #include > @@ -45,9 +47,6 @@ > #define NFULNL_QTHRESH_DEFAULT 100 /* 100 packets */ > #define NFULNL_COPY_RANGE_MAX 0xFFFF /* max packet size is limited by 16-bit struct nfattr nfa_len field */ > > -#define PRINTR(x, args...) do { if (net_ratelimit()) \ > - printk(x, ## args); } while (0); > - > struct nfulnl_instance { > struct hlist_node hlist; /* global list of instances */ > spinlock_t lock; > @@ -335,8 +334,7 @@ nfulnl_alloc_skb(struct net *net, u32 peer_portid, unsigned int inst_size, > skb = nfnetlink_alloc_skb(net, pkt_size, > peer_portid, GFP_ATOMIC); > if (!skb) > - pr_err("nfnetlink_log: can't even alloc %u bytes\n", > - pkt_size); > + pr_err("can't even alloc %u bytes\n", pkt_size); > } > } > > @@ -569,7 +567,7 @@ __build_packet_message(struct nfnl_log_net *log, > int size = nla_attr_size(data_len); > > if (skb_tailroom(inst->skb) < nla_total_size(data_len)) { > - printk(KERN_WARNING "nfnetlink_log: no tailroom!\n"); > + pr_warn("no tailroom!\n"); > return -1; > } > > @@ -585,7 +583,8 @@ __build_packet_message(struct nfnl_log_net *log, > return 0; > > nla_put_failure: > - PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n"); > + if (net_ratelimit()) > + pr_err("error creating log nlmsg\n"); I'll send a v2 using pr_err_ratelimited() instead Marcelo