summaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_fragment.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-17 19:47:21 -0700
committerDavid S. Miller <davem@davemloft.net>2007-10-17 19:47:21 -0700
commitabd6523d15f40bfee14652619a31a7f65f77f581 (patch)
treead5692b3c115c4859b99a5e87db8d4b2d991e5a8 /net/ipv4/inet_fragment.c
parentc6fda282294da882f8d8cc4c513940277dd380f5 (diff)
downloadop-kernel-dev-abd6523d15f40bfee14652619a31a7f65f77f581.zip
op-kernel-dev-abd6523d15f40bfee14652619a31a7f65f77f581.tar.gz
[INET]: Consolidate xxx_find() in fragment management
Here we need another callback ->match to check whether the entry found in hash matches the key passed. The key used is the same as the creation argument for inet_frag_create. Yet again, this ->match is the same for netfilter and ipv6. Running a frew steps forward - this callback will later replace the ->equal one. Since the inet_frag_find() uses the already consolidated inet_frag_create() remove the xxx_frag_create from protocol codes. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_fragment.c')
-rw-r--r--net/ipv4/inet_fragment.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index b531f80..6ba98eb 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -226,8 +226,8 @@ static struct inet_frag_queue *inet_frag_alloc(struct inet_frags *f, void *arg)
return q;
}
-struct inet_frag_queue *inet_frag_create(struct inet_frags *f, void *arg,
- unsigned int hash)
+static struct inet_frag_queue *inet_frag_create(struct inet_frags *f,
+ void *arg, unsigned int hash)
{
struct inet_frag_queue *q;
@@ -237,4 +237,23 @@ struct inet_frag_queue *inet_frag_create(struct inet_frags *f, void *arg,
return inet_frag_intern(q, f, hash);
}
-EXPORT_SYMBOL(inet_frag_create);
+
+struct inet_frag_queue *inet_frag_find(struct inet_frags *f, void *key,
+ unsigned int hash)
+{
+ struct inet_frag_queue *q;
+ struct hlist_node *n;
+
+ read_lock(&f->lock);
+ hlist_for_each_entry(q, n, &f->hash[hash], list) {
+ if (f->match(q, key)) {
+ atomic_inc(&q->refcnt);
+ read_unlock(&f->lock);
+ return q;
+ }
+ }
+ read_unlock(&f->lock);
+
+ return inet_frag_create(f, key, hash);
+}
+EXPORT_SYMBOL(inet_frag_find);
OpenPOWER on IntegriCloud