13 files changed, 28 insertions, 60 deletions

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index d7e86ef9d23a..86137b558f45 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1699,10 +1699,8 @@ ip_set_init(void)
 
         ip_set_list = kzalloc(sizeof(struct ip_set *) * ip_set_max,
                               GFP_KERNEL);
-        if (!ip_set_list) {
-                pr_err("ip_set: Unable to create ip_set_list\n");
+        if (!ip_set_list)
                 return -ENOMEM;
-        }
 
         ret = nfnetlink_subsys_register(&ip_set_netlink_subsys);
         if (ret != 0) {
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 00ea1ad00c04..46a8130d3f42 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1877,10 +1877,9 @@ static int __net_init __ip_vs_init(struct net *net)
         struct netns_ipvs *ipvs;
 
         ipvs = net_generic(net, ip_vs_net_id);
-        if (ipvs == NULL) {
-                pr_err("%s(): no memory.\n", __func__);
+        if (ipvs == NULL)
                 return -ENOMEM;
-        }
+
         /* Hold the beast until a service is registerd */
         ipvs->enable = 0;
         ipvs->net = net;
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 993935c0e472..008bf97cc91a 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -856,15 +856,12 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest,
         }
 
         dest = kzalloc(sizeof(struct ip_vs_dest), GFP_KERNEL);
-        if (dest == NULL) {
-                pr_err("%s(): no memory.\n", __func__);
+        if (dest == NULL)
                 return -ENOMEM;
-        }
+
         dest->stats.cpustats = alloc_percpu(struct ip_vs_cpu_stats);
-        if (!dest->stats.cpustats) {
-                pr_err("%s() alloc_percpu failed\n", __func__);
+        if (!dest->stats.cpustats)
                 goto err_alloc;
-        }
 
         dest->af = svc->af;
         dest->protocol = svc->protocol;
@@ -1168,10 +1165,8 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u,
                 goto out_err;
         }
         svc->stats.cpustats = alloc_percpu(struct ip_vs_cpu_stats);
-        if (!svc->stats.cpustats) {
-                pr_err("%s() alloc_percpu failed\n", __func__);
+        if (!svc->stats.cpustats)
                 goto out_err;
-        }
 
         /* I'm the first user of the service */
         atomic_set(&svc->usecnt, 0);
@@ -3716,10 +3711,9 @@ int __net_init ip_vs_control_net_init(struct net *net)
 
         /* procfs stats */
         ipvs->tot_stats.cpustats = alloc_percpu(struct ip_vs_cpu_stats);
-        if (!ipvs->tot_stats.cpustats) {
-                pr_err("%s(): alloc_percpu.\n", __func__);
+        if (!ipvs->tot_stats.cpustats)
                 return -ENOMEM;
-        }
+
         spin_lock_init(&ipvs->tot_stats.lock);
 
         proc_net_fops_create(net, "ip_vs", 0, &ip_vs_info_fops);
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index 95fd0d14200b..1c269e56200a 100644
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -150,10 +150,9 @@ static int ip_vs_dh_init_svc(struct ip_vs_service *svc)
         /* allocate the DH table for this service */
         tbl = kmalloc(sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE,
                       GFP_ATOMIC);
-        if (tbl == NULL) {
-                pr_err("%s(): no memory\n", __func__);
+        if (tbl == NULL)
                 return -ENOMEM;
-        }
+
         svc->sched_data = tbl;
         IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) allocated for "
                   "current service\n",
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index 87e40ea77a95..0f16283fd058 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -202,10 +202,8 @@ ip_vs_lblc_new(struct ip_vs_lblc_table *tbl, const union nf_inet_addr *daddr,
         en = ip_vs_lblc_get(dest->af, tbl, daddr);
         if (!en) {
                 en = kmalloc(sizeof(*en), GFP_ATOMIC);
-                if (!en) {
-                        pr_err("%s(): no memory\n", __func__);
+                if (!en)
                         return NULL;
-                }
 
                 en->af = dest->af;
                 ip_vs_addr_copy(dest->af, &en->addr, daddr);
@@ -345,10 +343,9 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc)
          *    Allocate the ip_vs_lblc_table for this service
          */
         tbl = kmalloc(sizeof(*tbl), GFP_ATOMIC);
-        if (tbl == NULL) {
-                pr_err("%s(): no memory\n", __func__);
+        if (tbl == NULL)
                 return -ENOMEM;
-        }
+
         svc->sched_data = tbl;
         IP_VS_DBG(6, "LBLC hash table (memory=%Zdbytes) allocated for "
                   "current service\n", sizeof(*tbl));
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 90f618ab6dda..eec797f8cce7 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -112,10 +112,8 @@ ip_vs_dest_set_insert(struct ip_vs_dest_set *set, struct ip_vs_dest *dest)
         }
 
         e = kmalloc(sizeof(*e), GFP_ATOMIC);
-        if (e == NULL) {
-                pr_err("%s(): no memory\n", __func__);
+        if (e == NULL)
                 return NULL;
-        }
 
         atomic_inc(&dest->refcnt);
         e->dest = dest;
@@ -373,10 +371,8 @@ ip_vs_lblcr_new(struct ip_vs_lblcr_table *tbl, const union nf_inet_addr *daddr,
         en = ip_vs_lblcr_get(dest->af, tbl, daddr);
         if (!en) {
                 en = kmalloc(sizeof(*en), GFP_ATOMIC);
-                if (!en) {
-                        pr_err("%s(): no memory\n", __func__);
+                if (!en)
                         return NULL;
-                }
 
                 en->af = dest->af;
                 ip_vs_addr_copy(dest->af, &en->addr, daddr);
@@ -516,10 +512,9 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc)
          *    Allocate the ip_vs_lblcr_table for this service
          */
         tbl = kmalloc(sizeof(*tbl), GFP_ATOMIC);
-        if (tbl == NULL) {
-                pr_err("%s(): no memory\n", __func__);
+        if (tbl == NULL)
                 return -ENOMEM;
-        }
+
         svc->sched_data = tbl;
         IP_VS_DBG(6, "LBLCR hash table (memory=%Zdbytes) allocated for "
                   "current service\n", sizeof(*tbl));
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index 52d073c105e9..85312939695f 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -74,10 +74,9 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp)
         struct ip_vs_proto_data *pd =
                         kzalloc(sizeof(struct ip_vs_proto_data), GFP_ATOMIC);
 
-        if (!pd) {
-                pr_err("%s(): no memory.\n", __func__);
+        if (!pd)
                 return -ENOMEM;
-        }
+
         pd->pp = pp;    /* For speed issues */
         pd->next = ipvs->proto_data_table[hash];
         ipvs->proto_data_table[hash] = pd;
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index b5e2556c581a..33815f4fb451 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -147,10 +147,9 @@ static int ip_vs_sh_init_svc(struct ip_vs_service *svc)
         /* allocate the SH table for this service */
         tbl = kmalloc(sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE,
                       GFP_ATOMIC);
-        if (tbl == NULL) {
-                pr_err("%s(): no memory\n", __func__);
+        if (tbl == NULL)
                 return -ENOMEM;
-        }
+
         svc->sched_data = tbl;
         IP_VS_DBG(6, "SH hash table (memory=%Zdbytes) allocated for "
                   "current service\n",
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
index 1ef41f50723c..fd0d4e09876a 100644
--- a/net/netfilter/ipvs/ip_vs_wrr.c
+++ b/net/netfilter/ipvs/ip_vs_wrr.c
@@ -85,10 +85,9 @@ static int ip_vs_wrr_init_svc(struct ip_vs_service *svc)
          *    Allocate the mark variable for WRR scheduling
          */
         mark = kmalloc(sizeof(struct ip_vs_wrr_mark), GFP_ATOMIC);
-        if (mark == NULL) {
-                pr_err("%s(): no memory\n", __func__);
+        if (mark == NULL)
                 return -ENOMEM;
-        }
+
         mark->cl = &svc->destinations;
         mark->cw = 0;
         mark->mw = ip_vs_wrr_max_weight(svc);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 5acfaf59a9c3..7202b0631cd6 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -661,7 +661,6 @@ __nf_conntrack_alloc(struct net *net, u16 zone,
          */
         ct = kmem_cache_alloc(net->ct.nf_conntrack_cachep, gfp);
         if (ct == NULL) {
-                pr_debug("nf_conntrack_alloc: Can't alloc conntrack.\n");
                 atomic_dec(&net->ct.count);
                 return ERR_PTR(-ENOMEM);
         }
@@ -749,10 +748,8 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
 
         ct = __nf_conntrack_alloc(net, zone, tuple, &repl_tuple, GFP_ATOMIC,
                                   hash);
-        if (IS_ERR(ct)) {
-                pr_debug("Can't allocate conntrack.\n");
+        if (IS_ERR(ct))
                 return (struct nf_conntrack_tuple_hash *)ct;
-        }
 
         if (!l4proto->new(ct, skb, dataoff)) {
                 nf_conntrack_free(ct);
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 2d8158acf6fa..66b2c54c544f 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -307,17 +307,14 @@ nfulnl_alloc_skb(unsigned int inst_size, unsigned int pkt_size)
         n = max(inst_size, pkt_size);
         skb = alloc_skb(n, GFP_ATOMIC);
         if (!skb) {
-                pr_notice("nfnetlink_log: can't alloc whole buffer (%u bytes)\n",
-                        inst_size);
-
                 if (n > pkt_size) {
                         /* try to allocate only as much as we need for current
                          * packet */
 
                         skb = alloc_skb(pkt_size, GFP_ATOMIC);
                         if (!skb)
-                                pr_err("nfnetlink_log: can't even alloc %u "
-                                       "bytes\n", pkt_size);
+                                pr_err("nfnetlink_log: can't even alloc %u bytes\n",
+                                       pkt_size);
                 }
         }
 
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index 3bdd443aaf15..f407ebc13481 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -122,14 +122,12 @@ static int idletimer_tg_create(struct idletimer_tg_info *info)
 
         info->timer = kmalloc(sizeof(*info->timer), GFP_KERNEL);
         if (!info->timer) {
-                pr_debug("couldn't alloc timer\n");
                 ret = -ENOMEM;
                 goto out;
         }
 
         info->timer->attr.attr.name = kstrdup(info->label, GFP_KERNEL);
         if (!info->timer->attr.attr.name) {
-                pr_debug("couldn't alloc attribute name\n");
                 ret = -ENOMEM;
                 goto out_free_timer;
         }
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 9228ee0dc11a..dfd52bad1523 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -176,10 +176,7 @@ dsthash_alloc_init(struct xt_hashlimit_htable *ht,
                 ent = NULL;
         } else
                 ent = kmem_cache_alloc(hashlimit_cachep, GFP_ATOMIC);
-        if (!ent) {
-                if (net_ratelimit())
-                        pr_err("cannot allocate dsthash_ent\n");
-        } else {
+        if (ent) {
                 memcpy(&ent->dst, dst, sizeof(ent->dst));
                 spin_lock_init(&ent->lock);