diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-15 11:58:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-15 11:58:02 -0700 |
| commit | 21071344e67ebe2b2e1ae093728fc1d65246bcbd (patch) | |
| tree | a7c3afb4c1884e98bd88156b3e9e256d03562351 /net | |
| parent | 28c8e4790ca5ef75f54895ca46437f9fbb433ddf (diff) | |
| parent | aea9d711f3d68c656ad31ab578ecfb0bb5cd7f97 (diff) | |
| download | linux-21071344e67ebe2b2e1ae093728fc1d65246bcbd.tar.gz linux-21071344e67ebe2b2e1ae093728fc1d65246bcbd.tar.bz2 linux-21071344e67ebe2b2e1ae093728fc1d65246bcbd.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_conn.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index d8f7e8ef67b4..ff04e9edbed6 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -162,6 +162,7 @@ static inline int ip_vs_conn_hash(struct ip_vs_conn *cp) hash = ip_vs_conn_hashkey(cp->af, cp->protocol, &cp->caddr, cp->cport); ct_write_lock(hash); + spin_lock(&cp->lock); if (!(cp->flags & IP_VS_CONN_F_HASHED)) { list_add(&cp->c_list, &ip_vs_conn_tab[hash]); @@ -174,6 +175,7 @@ static inline int ip_vs_conn_hash(struct ip_vs_conn *cp) ret = 0; } + spin_unlock(&cp->lock); ct_write_unlock(hash); return ret; @@ -193,6 +195,7 @@ static inline int ip_vs_conn_unhash(struct ip_vs_conn *cp) hash = ip_vs_conn_hashkey(cp->af, cp->protocol, &cp->caddr, cp->cport); ct_write_lock(hash); + spin_lock(&cp->lock); if (cp->flags & IP_VS_CONN_F_HASHED) { list_del(&cp->c_list); @@ -202,6 +205,7 @@ static inline int ip_vs_conn_unhash(struct ip_vs_conn *cp) } else ret = 0; + spin_unlock(&cp->lock); ct_write_unlock(hash); return ret; |