diff options
| author |   Patrick McHardy <kaber@trash.net> | 2008-01-31 04:38:58 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-31 19:27:54 -0800 |
| commit | f8ba1affa18398610e765736153fff614309ccc8 (patch) | |
| tree | b2143ef65aa92e5995070824798b04d935044e24 /net/netfilter/nf_conntrack_helper.c | |
| parent | [NETFILTER]: nf_conntrack: use RCU for conntrack hash (diff) | |
| download | linux-dev-f8ba1affa18398610e765736153fff614309ccc8.tar.xz linux-dev-f8ba1affa18398610e765736153fff614309ccc8.zip | |
[NETFILTER]: nf_conntrack: switch rwlock to spinlock
With the RCU conversion only write_lock usages of nf_conntrack_lock are
left (except one read_lock that should actually use write_lock in the
H.323 helper). Switch to a spinlock.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_helper.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 42f781fcba64..b1fd21cc1dbc 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -138,7 +138,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me) */ synchronize_rcu(); - write_lock_bh(&nf_conntrack_lock); + spin_lock_bh(&nf_conntrack_lock); /* Get rid of expectations */ for (i = 0; i < nf_ct_expect_hsize; i++) { @@ -160,7 +160,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me) hlist_for_each_entry(h, n, &nf_conntrack_hash[i], hnode) unhelp(h, me); } - write_unlock_bh(&nf_conntrack_lock); + spin_unlock_bh(&nf_conntrack_lock); } EXPORT_SYMBOL_GPL(nf_conntrack_helper_unregister); |