diff options
| author | James Morris <jmorris@namei.org> | 2009-03-28 06:57:13 +0300 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-28 06:57:13 +0300 |
| commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
| tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /include/net/inet_frag.h | |
| parent | a106cbfd1f3703402fc2d95d97e7a054102250f0 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
| download | linux-bb798169d1bb860b07192cf9c75937fadc8610b4.tar.xz | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'include/net/inet_frag.h')
| -rw-r--r-- | include/net/inet_frag.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index e081eefd6f47..39f2dc943908 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -61,7 +61,8 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f, int *work); int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f); struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, - struct inet_frags *f, void *key, unsigned int hash); + struct inet_frags *f, void *key, unsigned int hash) + __releases(&f->lock); static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f) { |