netfilter: Convert pr_warning to pr_warn

Use the more common pr_warn.

Other miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index ec8114fae50b297f56760c3ac22d378c31957cd4..5593e97426c45cfa47559b5b631f42211ef13cda 100644 (file)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -101,7 +101,7 @@ load_settype(const char *name)
        nfnl_unlock(NFNL_SUBSYS_IPSET);
        pr_debug("try to load ip_set_%s\n", name);
        if (request_module("ip_set_%s", name) < 0) {
-               pr_warning("Can't find ip_set type %s\n", name);
+               pr_warn("Can't find ip_set type %s\n", name);
                nfnl_lock(NFNL_SUBSYS_IPSET);
                return false;
        }
@@ -195,20 +195,19 @@ ip_set_type_register(struct ip_set_type *type)
        int ret = 0;
 
        if (type->protocol != IPSET_PROTOCOL) {
-               pr_warning("ip_set type %s, family %s, revision %u:%u uses "
-                          "wrong protocol version %u (want %u)\n",
-                          type->name, family_name(type->family),
-                          type->revision_min, type->revision_max,
-                          type->protocol, IPSET_PROTOCOL);
+               pr_warn("ip_set type %s, family %s, revision %u:%u uses wrong protocol version %u (want %u)\n",
+                       type->name, family_name(type->family),
+                       type->revision_min, type->revision_max,
+                       type->protocol, IPSET_PROTOCOL);
                return -EINVAL;
        }
 
        ip_set_type_lock();
        if (find_set_type(type->name, type->family, type->revision_min)) {
                /* Duplicate! */
-               pr_warning("ip_set type %s, family %s with revision min %u "
-                          "already registered!\n", type->name,
-                          family_name(type->family), type->revision_min);
+               pr_warn("ip_set type %s, family %s with revision min %u already registered!\n",
+                       type->name, family_name(type->family),
+                       type->revision_min);
                ret = -EINVAL;
                goto unlock;
        }
@@ -228,9 +227,9 @@ ip_set_type_unregister(struct ip_set_type *type)
 {
        ip_set_type_lock();
        if (!find_set_type(type->name, type->family, type->revision_min)) {
-               pr_warning("ip_set type %s, family %s with revision min %u "
-                          "not registered\n", type->name,
-                          family_name(type->family), type->revision_min);
+               pr_warn("ip_set type %s, family %s with revision min %u not registered\n",
+                       type->name, family_name(type->family),
+                       type->revision_min);
                goto unlock;
        }
        list_del_rcu(&type->list);

diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index 61c7fb052802e7c0cb291289ee29c484b4f84179..80f49dfba5556a0c572035688b8cebeed1752c13 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -565,8 +565,8 @@ retry:
                 set->name, orig->htable_bits, htable_bits, orig);
        if (!htable_bits) {
                /* In case we have plenty of memory :-) */
-               pr_warning("Cannot increase the hashsize of set %s further\n",
-                          set->name);
+               pr_warn("Cannot increase the hashsize of set %s further\n",
+                       set->name);
                return -IPSET_ERR_HASH_FULL;
        }
        t = ip_set_alloc(sizeof(*t)
@@ -651,8 +651,8 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,
 
        if (h->elements >= h->maxelem) {
                if (net_ratelimit())
-                       pr_warning("Set %s is full, maxelem %u reached\n",
-                                  set->name, h->maxelem);
+                       pr_warn("Set %s is full, maxelem %u reached\n",
+                               set->name, h->maxelem);
                return -IPSET_ERR_HASH_FULL;
        }
 
@@ -998,8 +998,8 @@ mtype_list(const struct ip_set *set,
 nla_put_failure:
        nlmsg_trim(skb, incomplete);
        if (unlikely(first == cb->args[IPSET_CB_ARG0])) {
-               pr_warning("Can't list set %s: one bucket does not fit into "
-                          "a message. Please report it!\n", set->name);
+               pr_warn("Can't list set %s: one bucket does not fit into a message. Please report it!\n",
+                       set->name);
                cb->args[IPSET_CB_ARG0] = 0;
                return -EMSGSIZE;
        }

diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index 1e634615ab9d6e4b2a5c7db5872332c5a522f435..d4bec261e74e636e5a51c8ea95480f15bc61a1ab 100644 (file)
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -120,7 +120,7 @@ static int connbytes_mt_check(const struct xt_mtchk_param *par)
         * accounting is enabled, so complain in the hope that someone notices.
         */
        if (!nf_ct_acct_enabled(par->net)) {
-               pr_warning("Forcing CT accounting to be enabled\n");
+               pr_warn("Forcing CT accounting to be enabled\n");
                nf_ct_set_acct(par->net, true);
        }
 

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 52eb3e03458d95a3f65b8e8cfd39f4b847cc39c0..05fbc2a0be4614aff1fbe55fccce25eb30041c0e 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -943,7 +943,7 @@ static int __init hashlimit_mt_init(void)
                                            sizeof(struct dsthash_ent), 0, 0,
                                            NULL);
        if (!hashlimit_cachep) {
-               pr_warning("unable to create slab cache\n");
+               pr_warn("unable to create slab cache\n");
                goto err2;
        }
        return 0;

diff --git a/net/netfilter/xt_set.c b/net/netfilter/xt_set.c
index 80c2e2d603e00c718ad1744804ef29f926b9d404..cb70f6ec5695f8216b303c733a9985ae9c0778e0 100644 (file)
--- a/net/netfilter/xt_set.c
+++ b/net/netfilter/xt_set.c
@@ -84,13 +84,12 @@ set_match_v0_checkentry(const struct xt_mtchk_param *par)
        index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
 
        if (index == IPSET_INVALID_ID) {
-               pr_warning("Cannot find set identified by id %u to match\n",
-                          info->match_set.index);
+               pr_warn("Cannot find set identified by id %u to match\n",
+                       info->match_set.index);
                return -ENOENT;
        }
        if (info->match_set.u.flags[IPSET_DIM_MAX-1] != 0) {
-               pr_warning("Protocol error: set match dimension "
-                          "is over the limit!\n");
+               pr_warn("Protocol error: set match dimension is over the limit!\n");
                ip_set_nfnl_put(par->net, info->match_set.index);
                return -ERANGE;
        }
@@ -134,13 +133,12 @@ set_match_v1_checkentry(const struct xt_mtchk_param *par)
        index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
 
        if (index == IPSET_INVALID_ID) {
-               pr_warning("Cannot find set identified by id %u to match\n",
-                          info->match_set.index);
+               pr_warn("Cannot find set identified by id %u to match\n",
+                       info->match_set.index);
                return -ENOENT;
        }
        if (info->match_set.dim > IPSET_DIM_MAX) {
-               pr_warning("Protocol error: set match dimension "
-                          "is over the limit!\n");
+               pr_warn("Protocol error: set match dimension is over the limit!\n");
                ip_set_nfnl_put(par->net, info->match_set.index);
                return -ERANGE;
        }
@@ -230,8 +228,8 @@ set_target_v0_checkentry(const struct xt_tgchk_param *par)
        if (info->add_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(par->net, info->add_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("Cannot find add_set index %u as target\n",
-                                  info->add_set.index);
+                       pr_warn("Cannot find add_set index %u as target\n",
+                               info->add_set.index);
                        return -ENOENT;
                }
        }
@@ -239,8 +237,8 @@ set_target_v0_checkentry(const struct xt_tgchk_param *par)
        if (info->del_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(par->net, info->del_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("Cannot find del_set index %u as target\n",
-                                  info->del_set.index);
+                       pr_warn("Cannot find del_set index %u as target\n",
+                               info->del_set.index);
                        if (info->add_set.index != IPSET_INVALID_ID)
                                ip_set_nfnl_put(par->net, info->add_set.index);
                        return -ENOENT;
@@ -248,8 +246,7 @@ set_target_v0_checkentry(const struct xt_tgchk_param *par)
        }
        if (info->add_set.u.flags[IPSET_DIM_MAX-1] != 0 ||
            info->del_set.u.flags[IPSET_DIM_MAX-1] != 0) {
-               pr_warning("Protocol error: SET target dimension "
-                          "is over the limit!\n");
+               pr_warn("Protocol error: SET target dimension is over the limit!\n");
                if (info->add_set.index != IPSET_INVALID_ID)
                        ip_set_nfnl_put(par->net, info->add_set.index);
                if (info->del_set.index != IPSET_INVALID_ID)
@@ -303,8 +300,8 @@ set_target_v1_checkentry(const struct xt_tgchk_param *par)
        if (info->add_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(par->net, info->add_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("Cannot find add_set index %u as target\n",
-                                  info->add_set.index);
+                       pr_warn("Cannot find add_set index %u as target\n",
+                               info->add_set.index);
                        return -ENOENT;
                }
        }
@@ -312,8 +309,8 @@ set_target_v1_checkentry(const struct xt_tgchk_param *par)
        if (info->del_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(par->net, info->del_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("Cannot find del_set index %u as target\n",
-                                  info->del_set.index);
+                       pr_warn("Cannot find del_set index %u as target\n",
+                               info->del_set.index);
                        if (info->add_set.index != IPSET_INVALID_ID)
                                ip_set_nfnl_put(par->net, info->add_set.index);
                        return -ENOENT;
@@ -321,8 +318,7 @@ set_target_v1_checkentry(const struct xt_tgchk_param *par)
        }
        if (info->add_set.dim > IPSET_DIM_MAX ||
            info->del_set.dim > IPSET_DIM_MAX) {
-               pr_warning("Protocol error: SET target dimension "
-                          "is over the limit!\n");
+               pr_warn("Protocol error: SET target dimension is over the limit!\n");
                if (info->add_set.index != IPSET_INVALID_ID)
                        ip_set_nfnl_put(par->net, info->add_set.index);
                if (info->del_set.index != IPSET_INVALID_ID)