Skip to contentSkip to conversation

: Rename misnamed function

PATCH In review Patrick McHardy 1 participant 1 message Sep 15, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/8 : Rename misnamed function

[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.

---
commit 1305f20c8446e6e944924a93eaf90e1896abf788
tree 174c9c8184ec0cdb3de92530ba3b1ae22d308191
parent 66479fa28dab1e923dd946ae1eafe7cbf89fa9a1
author Patrick McHardy <[email protected]> Thu, 15 Sep 2005 22:40:37 +0200 committer Patrick McHardy <[email protected]> Thu, 15 Sep 2005 22:40:37 +0200

 include/linux/netfilter_ipv4/ip_conntrack.h  |    2 +-
 net/ipv4/netfilter/ip_conntrack_core.c       |    2 +-
 net/ipv4/netfilter/ip_conntrack_netlink.c    |    4 ++--
 net/ipv4/netfilter/ip_conntrack_standalone.c |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
include/linux/netfilter_ipv4/ip_conntrack.h +1 -1
@@ -384,7 +384,7 @@ extern struct ip_conntrack_expect *
 __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);
 
 extern struct ip_conntrack_expect *
-ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple);
+ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);
 
 extern struct ip_conntrack_tuple_hash *
 __ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
net/ipv4/netfilter/ip_conntrack_core.c +1 -1
@@ -233,7 +233,7 @@ __ip_conntrack_expect_find(const struct 
 
 /* Just find a expectation corresponding to a tuple. */
 struct ip_conntrack_expect *
-ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple)
+ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple)
 {
 	struct ip_conntrack_expect *i;
 	
net/ipv4/netfilter/ip_conntrack_netlink.c +2 -2
@@ -1270,7 +1270,7 @@ ctnetlink_get_expect(struct sock *ctnl, 
 	if (err < 0)
 		return err;
 
-	exp = ip_conntrack_expect_find_get(&tuple);
+	exp = ip_conntrack_expect_find(&tuple);
 	if (!exp)
 		return -ENOENT;
 
@@ -1318,7 +1318,7 @@ ctnetlink_del_expect(struct sock *ctnl, 
 			return err;
 
 		/* bump usage count to 2 */
-		exp = ip_conntrack_expect_find_get(&tuple);
+		exp = ip_conntrack_expect_find(&tuple);
 		if (!exp)
 			return -ENOENT;
 
net/ipv4/netfilter/ip_conntrack_standalone.c +2 -2
@@ -993,11 +993,11 @@ EXPORT_SYMBOL(ip_ct_refresh_acct);
 
 EXPORT_SYMBOL(ip_conntrack_expect_alloc);
 EXPORT_SYMBOL(ip_conntrack_expect_put);
-EXPORT_SYMBOL_GPL(ip_conntrack_expect_find_get);
+EXPORT_SYMBOL_GPL(__ip_conntrack_expect_find);
+EXPORT_SYMBOL_GPL(ip_conntrack_expect_find);
 EXPORT_SYMBOL(ip_conntrack_expect_related);
 EXPORT_SYMBOL(ip_conntrack_unexpect_related);
 EXPORT_SYMBOL_GPL(ip_conntrack_expect_list);
-EXPORT_SYMBOL_GPL(__ip_conntrack_expect_find);
 EXPORT_SYMBOL_GPL(ip_ct_unlink_expect);
 
 EXPORT_SYMBOL(ip_conntrack_tuple_taken);