ipset: drop ipset_nest_start() and ipset_nest_end()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

After the previous commit, both ipset_nest_start() and ipset_nest_end() are
just aliases for nla_nest_start() and nla_nest_end() so that there is no
need to keep them.

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Michal Kubecek and committed by

David S. Miller 7 years ago 12ad5f65 ae0be8de

+25 -28

4 changed files

expand all

include

linux

netfilter

ipset

ip_set.h

net

netfilter

ipset

ip_set_bitmap_gen.h

ip_set_hash_gen.h

ip_set_list_set.c

+4 -7

include/linux/netfilter/ipset/ip_set.h

··· 401 401 return ntohs(nla_get_be16(attr)); 402 402 } 403 403 404 - #define ipset_nest_start(skb, attr) nla_nest_start(skb, attr) 405 - #define ipset_nest_end(skb, start) nla_nest_end(skb, start) 406 - 407 404 static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr) 408 405 { 409 - struct nlattr *__nested = ipset_nest_start(skb, type); 406 + struct nlattr *__nested = nla_nest_start(skb, type); 410 407 int ret; 411 408 412 409 if (!__nested) 413 410 return -EMSGSIZE; 414 411 ret = nla_put_in_addr(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr); 415 412 if (!ret) 416 - ipset_nest_end(skb, __nested); 413 + nla_nest_end(skb, __nested); 417 414 return ret; 418 415 } 419 416 420 417 static inline int nla_put_ipaddr6(struct sk_buff *skb, int type, 421 418 const struct in6_addr *ipaddrptr) 422 419 { 423 - struct nlattr *__nested = ipset_nest_start(skb, type); 420 + struct nlattr *__nested = nla_nest_start(skb, type); 424 421 int ret; 425 422 426 423 if (!__nested) 427 424 return -EMSGSIZE; 428 425 ret = nla_put_in6_addr(skb, IPSET_ATTR_IPADDR_IPV6, ipaddrptr); 429 426 if (!ret) 430 - ipset_nest_end(skb, __nested); 427 + nla_nest_end(skb, __nested); 431 428 return ret; 432 429 } 433 430

+7 -7

net/netfilter/ipset/ip_set_bitmap_gen.h

··· 99 99 struct nlattr *nested; 100 100 size_t memsize = mtype_memsize(map, set->dsize) + set->ext_size; 101 101 102 - nested = ipset_nest_start(skb, IPSET_ATTR_DATA); 102 + nested = nla_nest_start(skb, IPSET_ATTR_DATA); 103 103 if (!nested) 104 104 goto nla_put_failure; 105 105 if (mtype_do_head(skb, map) || ··· 109 109 goto nla_put_failure; 110 110 if (unlikely(ip_set_put_flags(skb, set))) 111 111 goto nla_put_failure; 112 - ipset_nest_end(skb, nested); 112 + nla_nest_end(skb, nested); 113 113 114 114 return 0; 115 115 nla_put_failure: ··· 213 213 u32 id, first = cb->args[IPSET_CB_ARG0]; 214 214 int ret = 0; 215 215 216 - adt = ipset_nest_start(skb, IPSET_ATTR_ADT); 216 + adt = nla_nest_start(skb, IPSET_ATTR_ADT); 217 217 if (!adt) 218 218 return -EMSGSIZE; 219 219 /* Extensions may be replaced */ ··· 230 230 #endif 231 231 ip_set_timeout_expired(ext_timeout(x, set)))) 232 232 continue; 233 - nested = ipset_nest_start(skb, IPSET_ATTR_DATA); 233 + nested = nla_nest_start(skb, IPSET_ATTR_DATA); 234 234 if (!nested) { 235 235 if (id == first) { 236 236 nla_nest_cancel(skb, adt); ··· 244 244 goto nla_put_failure; 245 245 if (ip_set_put_extensions(skb, set, x, mtype_is_filled(x))) 246 246 goto nla_put_failure; 247 - ipset_nest_end(skb, nested); 247 + nla_nest_end(skb, nested); 248 248 } 249 - ipset_nest_end(skb, adt); 249 + nla_nest_end(skb, adt); 250 250 251 251 /* Set listing finished */ 252 252 cb->args[IPSET_CB_ARG0] = 0; ··· 259 259 cb->args[IPSET_CB_ARG0] = 0; 260 260 ret = -EMSGSIZE; 261 261 } 262 - ipset_nest_end(skb, adt); 262 + nla_nest_end(skb, adt); 263 263 out: 264 264 rcu_read_unlock(); 265 265 return ret;

+7 -7

net/netfilter/ipset/ip_set_hash_gen.h

··· 1057 1057 htable_bits = t->htable_bits; 1058 1058 rcu_read_unlock_bh(); 1059 1059 1060 - nested = ipset_nest_start(skb, IPSET_ATTR_DATA); 1060 + nested = nla_nest_start(skb, IPSET_ATTR_DATA); 1061 1061 if (!nested) 1062 1062 goto nla_put_failure; 1063 1063 if (nla_put_net32(skb, IPSET_ATTR_HASHSIZE, ··· 1079 1079 goto nla_put_failure; 1080 1080 if (unlikely(ip_set_put_flags(skb, set))) 1081 1081 goto nla_put_failure; 1082 - ipset_nest_end(skb, nested); 1082 + nla_nest_end(skb, nested); 1083 1083 1084 1084 return 0; 1085 1085 nla_put_failure: ··· 1124 1124 void *incomplete; 1125 1125 int i, ret = 0; 1126 1126 1127 - atd = ipset_nest_start(skb, IPSET_ATTR_ADT); 1127 + atd = nla_nest_start(skb, IPSET_ATTR_ADT); 1128 1128 if (!atd) 1129 1129 return -EMSGSIZE; 1130 1130 ··· 1150 1150 continue; 1151 1151 pr_debug("list hash %lu hbucket %p i %u, data %p\n", 1152 1152 cb->args[IPSET_CB_ARG0], n, i, e); 1153 - nested = ipset_nest_start(skb, IPSET_ATTR_DATA); 1153 + nested = nla_nest_start(skb, IPSET_ATTR_DATA); 1154 1154 if (!nested) { 1155 1155 if (cb->args[IPSET_CB_ARG0] == first) { 1156 1156 nla_nest_cancel(skb, atd); ··· 1163 1163 goto nla_put_failure; 1164 1164 if (ip_set_put_extensions(skb, set, e, true)) 1165 1165 goto nla_put_failure; 1166 - ipset_nest_end(skb, nested); 1166 + nla_nest_end(skb, nested); 1167 1167 } 1168 1168 } 1169 - ipset_nest_end(skb, atd); 1169 + nla_nest_end(skb, atd); 1170 1170 /* Set listing finished */ 1171 1171 cb->args[IPSET_CB_ARG0] = 0; 1172 1172 ··· 1180 1180 cb->args[IPSET_CB_ARG0] = 0; 1181 1181 ret = -EMSGSIZE; 1182 1182 } else { 1183 - ipset_nest_end(skb, atd); 1183 + nla_nest_end(skb, atd); 1184 1184 } 1185 1185 out: 1186 1186 rcu_read_unlock();

+7 -7

net/netfilter/ipset/ip_set_list_set.c

··· 466 466 struct nlattr *nested; 467 467 size_t memsize = list_set_memsize(map, set->dsize) + set->ext_size; 468 468 469 - nested = ipset_nest_start(skb, IPSET_ATTR_DATA); 469 + nested = nla_nest_start(skb, IPSET_ATTR_DATA); 470 470 if (!nested) 471 471 goto nla_put_failure; 472 472 if (nla_put_net32(skb, IPSET_ATTR_SIZE, htonl(map->size)) || ··· 476 476 goto nla_put_failure; 477 477 if (unlikely(ip_set_put_flags(skb, set))) 478 478 goto nla_put_failure; 479 - ipset_nest_end(skb, nested); 479 + nla_nest_end(skb, nested); 480 480 481 481 return 0; 482 482 nla_put_failure: ··· 494 494 struct set_elem *e; 495 495 int ret = 0; 496 496 497 - atd = ipset_nest_start(skb, IPSET_ATTR_ADT); 497 + atd = nla_nest_start(skb, IPSET_ATTR_ADT); 498 498 if (!atd) 499 499 return -EMSGSIZE; 500 500 ··· 506 506 i++; 507 507 continue; 508 508 } 509 - nested = ipset_nest_start(skb, IPSET_ATTR_DATA); 509 + nested = nla_nest_start(skb, IPSET_ATTR_DATA); 510 510 if (!nested) 511 511 goto nla_put_failure; 512 512 ip_set_name_byindex(map->net, e->id, name); ··· 514 514 goto nla_put_failure; 515 515 if (ip_set_put_extensions(skb, set, e, true)) 516 516 goto nla_put_failure; 517 - ipset_nest_end(skb, nested); 517 + nla_nest_end(skb, nested); 518 518 i++; 519 519 } 520 520 521 - ipset_nest_end(skb, atd); 521 + nla_nest_end(skb, atd); 522 522 /* Set listing finished */ 523 523 cb->args[IPSET_CB_ARG0] = 0; 524 524 goto out; ··· 531 531 ret = -EMSGSIZE; 532 532 } else { 533 533 cb->args[IPSET_CB_ARG0] = i; 534 - ipset_nest_end(skb, atd); 534 + nla_nest_end(skb, atd); 535 535 } 536 536 out: 537 537 rcu_read_unlock();