tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Joe Perches and committed by
David S. Miller b167a37c 47c4cfc3

+35 -40
+11 -12
net/netfilter/ipset/ip_set_core.c
··· 101 101 nfnl_unlock(NFNL_SUBSYS_IPSET); 102 102 pr_debug("try to load ip_set_%s\n", name); 103 103 if (request_module("ip_set_%s", name) < 0) { 104 - pr_warning("Can't find ip_set type %s\n", name); 104 + pr_warn("Can't find ip_set type %s\n", name); 105 105 nfnl_lock(NFNL_SUBSYS_IPSET); 106 106 return false; 107 107 } ··· 195 195 int ret = 0; 196 196 197 197 if (type->protocol != IPSET_PROTOCOL) { 198 - pr_warning("ip_set type %s, family %s, revision %u:%u uses " 199 - "wrong protocol version %u (want %u)\n", 200 - type->name, family_name(type->family), 201 - type->revision_min, type->revision_max, 202 - type->protocol, IPSET_PROTOCOL); 198 + pr_warn("ip_set type %s, family %s, revision %u:%u uses wrong protocol version %u (want %u)\n", 199 + type->name, family_name(type->family), 200 + type->revision_min, type->revision_max, 201 + type->protocol, IPSET_PROTOCOL); 203 202 return -EINVAL; 204 203 } 205 204 206 205 ip_set_type_lock(); 207 206 if (find_set_type(type->name, type->family, type->revision_min)) { 208 207 /* Duplicate! */ 209 - pr_warning("ip_set type %s, family %s with revision min %u " 210 - "already registered!\n", type->name, 211 - family_name(type->family), type->revision_min); 208 + pr_warn("ip_set type %s, family %s with revision min %u already registered!\n", 209 + type->name, family_name(type->family), 210 + type->revision_min); 212 211 ret = -EINVAL; 213 212 goto unlock; 214 213 } ··· 227 228 { 228 229 ip_set_type_lock(); 229 230 if (!find_set_type(type->name, type->family, type->revision_min)) { 230 - pr_warning("ip_set type %s, family %s with revision min %u " 231 - "not registered\n", type->name, 232 - family_name(type->family), type->revision_min); 231 + pr_warn("ip_set type %s, family %s with revision min %u not registered\n", 232 + type->name, family_name(type->family), 233 + type->revision_min); 233 234 goto unlock; 234 235 } 235 236 list_del_rcu(&type->list);
+6 -6
net/netfilter/ipset/ip_set_hash_gen.h
··· 565 565 set->name, orig->htable_bits, htable_bits, orig); 566 566 if (!htable_bits) { 567 567 /* In case we have plenty of memory :-) */ 568 - pr_warning("Cannot increase the hashsize of set %s further\n", 569 - set->name); 568 + pr_warn("Cannot increase the hashsize of set %s further\n", 569 + set->name); 570 570 return -IPSET_ERR_HASH_FULL; 571 571 } 572 572 t = ip_set_alloc(sizeof(*t) ··· 651 651 652 652 if (h->elements >= h->maxelem) { 653 653 if (net_ratelimit()) 654 - pr_warning("Set %s is full, maxelem %u reached\n", 655 - set->name, h->maxelem); 654 + pr_warn("Set %s is full, maxelem %u reached\n", 655 + set->name, h->maxelem); 656 656 return -IPSET_ERR_HASH_FULL; 657 657 } 658 658 ··· 998 998 nla_put_failure: 999 999 nlmsg_trim(skb, incomplete); 1000 1000 if (unlikely(first == cb->args[IPSET_CB_ARG0])) { 1001 - pr_warning("Can't list set %s: one bucket does not fit into " 1002 - "a message. Please report it!\n", set->name); 1001 + pr_warn("Can't list set %s: one bucket does not fit into a message. Please report it!\n", 1002 + set->name); 1003 1003 cb->args[IPSET_CB_ARG0] = 0; 1004 1004 return -EMSGSIZE; 1005 1005 }
+1 -1
net/netfilter/xt_connbytes.c
··· 120 120 * accounting is enabled, so complain in the hope that someone notices. 121 121 */ 122 122 if (!nf_ct_acct_enabled(par->net)) { 123 - pr_warning("Forcing CT accounting to be enabled\n"); 123 + pr_warn("Forcing CT accounting to be enabled\n"); 124 124 nf_ct_set_acct(par->net, true); 125 125 } 126 126
+1 -1
net/netfilter/xt_hashlimit.c
··· 943 943 sizeof(struct dsthash_ent), 0, 0, 944 944 NULL); 945 945 if (!hashlimit_cachep) { 946 - pr_warning("unable to create slab cache\n"); 946 + pr_warn("unable to create slab cache\n"); 947 947 goto err2; 948 948 } 949 949 return 0;
+16 -20
net/netfilter/xt_set.c
··· 84 84 index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); 85 85 86 86 if (index == IPSET_INVALID_ID) { 87 - pr_warning("Cannot find set identified by id %u to match\n", 88 - info->match_set.index); 87 + pr_warn("Cannot find set identified by id %u to match\n", 88 + info->match_set.index); 89 89 return -ENOENT; 90 90 } 91 91 if (info->match_set.u.flags[IPSET_DIM_MAX-1] != 0) { 92 - pr_warning("Protocol error: set match dimension " 93 - "is over the limit!\n"); 92 + pr_warn("Protocol error: set match dimension is over the limit!\n"); 94 93 ip_set_nfnl_put(par->net, info->match_set.index); 95 94 return -ERANGE; 96 95 } ··· 133 134 index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); 134 135 135 136 if (index == IPSET_INVALID_ID) { 136 - pr_warning("Cannot find set identified by id %u to match\n", 137 - info->match_set.index); 137 + pr_warn("Cannot find set identified by id %u to match\n", 138 + info->match_set.index); 138 139 return -ENOENT; 139 140 } 140 141 if (info->match_set.dim > IPSET_DIM_MAX) { 141 - pr_warning("Protocol error: set match dimension " 142 - "is over the limit!\n"); 142 + pr_warn("Protocol error: set match dimension is over the limit!\n"); 143 143 ip_set_nfnl_put(par->net, info->match_set.index); 144 144 return -ERANGE; 145 145 } ··· 228 230 if (info->add_set.index != IPSET_INVALID_ID) { 229 231 index = ip_set_nfnl_get_byindex(par->net, info->add_set.index); 230 232 if (index == IPSET_INVALID_ID) { 231 - pr_warning("Cannot find add_set index %u as target\n", 232 - info->add_set.index); 233 + pr_warn("Cannot find add_set index %u as target\n", 234 + info->add_set.index); 233 235 return -ENOENT; 234 236 } 235 237 } ··· 237 239 if (info->del_set.index != IPSET_INVALID_ID) { 238 240 index = ip_set_nfnl_get_byindex(par->net, info->del_set.index); 239 241 if (index == IPSET_INVALID_ID) { 240 - pr_warning("Cannot find del_set index %u as target\n", 241 - info->del_set.index); 242 + pr_warn("Cannot find del_set index %u as target\n", 243 + info->del_set.index); 242 244 if (info->add_set.index != IPSET_INVALID_ID) 243 245 ip_set_nfnl_put(par->net, info->add_set.index); 244 246 return -ENOENT; ··· 246 248 } 247 249 if (info->add_set.u.flags[IPSET_DIM_MAX-1] != 0 || 248 250 info->del_set.u.flags[IPSET_DIM_MAX-1] != 0) { 249 - pr_warning("Protocol error: SET target dimension " 250 - "is over the limit!\n"); 251 + pr_warn("Protocol error: SET target dimension is over the limit!\n"); 251 252 if (info->add_set.index != IPSET_INVALID_ID) 252 253 ip_set_nfnl_put(par->net, info->add_set.index); 253 254 if (info->del_set.index != IPSET_INVALID_ID) ··· 300 303 if (info->add_set.index != IPSET_INVALID_ID) { 301 304 index = ip_set_nfnl_get_byindex(par->net, info->add_set.index); 302 305 if (index == IPSET_INVALID_ID) { 303 - pr_warning("Cannot find add_set index %u as target\n", 304 - info->add_set.index); 306 + pr_warn("Cannot find add_set index %u as target\n", 307 + info->add_set.index); 305 308 return -ENOENT; 306 309 } 307 310 } ··· 309 312 if (info->del_set.index != IPSET_INVALID_ID) { 310 313 index = ip_set_nfnl_get_byindex(par->net, info->del_set.index); 311 314 if (index == IPSET_INVALID_ID) { 312 - pr_warning("Cannot find del_set index %u as target\n", 313 - info->del_set.index); 315 + pr_warn("Cannot find del_set index %u as target\n", 316 + info->del_set.index); 314 317 if (info->add_set.index != IPSET_INVALID_ID) 315 318 ip_set_nfnl_put(par->net, info->add_set.index); 316 319 return -ENOENT; ··· 318 321 } 319 322 if (info->add_set.dim > IPSET_DIM_MAX || 320 323 info->del_set.dim > IPSET_DIM_MAX) { 321 - pr_warning("Protocol error: SET target dimension " 322 - "is over the limit!\n"); 324 + pr_warn("Protocol error: SET target dimension is over the limit!\n"); 323 325 if (info->add_set.index != IPSET_INVALID_ID) 324 326 ip_set_nfnl_put(par->net, info->add_set.index); 325 327 if (info->del_set.index != IPSET_INVALID_ID)