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]: Rename misnamed function

Both __ip_conntrack_expect_find and ip_conntrack_expect_find_get take
a reference to the expectation, the difference is that callers of
__ip_conntrack_expect_find must hold ip_conntrack_lock.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Patrick McHardy and committed by David S. Miller a41bc002 e674d0f3

+6 -6
unified split
+1 -1
include/linux/netfilter_ipv4/ip_conntrack.h
··· 384 384 __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple); 385 385 386 386 extern struct ip_conntrack_expect * 387 - ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple); 387 + ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple); 388 388 389 389 extern struct ip_conntrack_tuple_hash * 390 390 __ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
+1 -1
net/ipv4/netfilter/ip_conntrack_core.c
··· 233 233 234 234 /* Just find a expectation corresponding to a tuple. */ 235 235 struct ip_conntrack_expect * 236 - ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple) 236 + ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple) 237 237 { 238 238 struct ip_conntrack_expect *i; 239 239
+2 -2
net/ipv4/netfilter/ip_conntrack_netlink.c
··· 1270 1270 if (err < 0) 1271 1271 return err; 1272 1272 1273 - exp = ip_conntrack_expect_find_get(&tuple); 1273 + exp = ip_conntrack_expect_find(&tuple); 1274 1274 if (!exp) 1275 1275 return -ENOENT; 1276 1276 ··· 1318 1318 return err; 1319 1319 1320 1320 /* bump usage count to 2 */ 1321 - exp = ip_conntrack_expect_find_get(&tuple); 1321 + exp = ip_conntrack_expect_find(&tuple); 1322 1322 if (!exp) 1323 1323 return -ENOENT; 1324 1324
+2 -2
net/ipv4/netfilter/ip_conntrack_standalone.c
··· 993 993 994 994 EXPORT_SYMBOL(ip_conntrack_expect_alloc); 995 995 EXPORT_SYMBOL(ip_conntrack_expect_put); 996 - EXPORT_SYMBOL_GPL(ip_conntrack_expect_find_get); 996 + EXPORT_SYMBOL_GPL(__ip_conntrack_expect_find); 997 + EXPORT_SYMBOL_GPL(ip_conntrack_expect_find); 997 998 EXPORT_SYMBOL(ip_conntrack_expect_related); 998 999 EXPORT_SYMBOL(ip_conntrack_unexpect_related); 999 1000 EXPORT_SYMBOL_GPL(ip_conntrack_expect_list); 1000 - EXPORT_SYMBOL_GPL(__ip_conntrack_expect_find); 1001 1001 EXPORT_SYMBOL_GPL(ip_ct_unlink_expect); 1002 1002 1003 1003 EXPORT_SYMBOL(ip_conntrack_tuple_taken);