diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-13 16:43:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-13 16:43:28 -0700 |
| commit | eaae44d248b151e7257ba551ae589cf343c3fdf6 (patch) | |
| tree | d08bb8495cea3730b31e3e916c1d091b65f46fa3 /net/netfilter/nf_log.c | |
| parent | 5b548140225c6bbbbd560551dd1048b2c0ce58be (diff) | |
| parent | 3dd5d7e3ba5e9b05586ff0d59ae6d700b7b7c607 (diff) | |
| download | kernel_samsung_smdk4412-eaae44d248b151e7257ba551ae589cf343c3fdf6.zip kernel_samsung_smdk4412-eaae44d248b151e7257ba551ae589cf343c3fdf6.tar.gz kernel_samsung_smdk4412-eaae44d248b151e7257ba551ae589cf343c3fdf6.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/nf_log.c')
| -rw-r--r-- | net/netfilter/nf_log.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index beb3731..2fefe14 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -248,14 +248,14 @@ static int nf_log_proc_dostring(ctl_table *table, int write, struct file *filp, rcu_assign_pointer(nf_loggers[tindex], logger); mutex_unlock(&nf_log_mutex); } else { - rcu_read_lock(); - logger = rcu_dereference(nf_loggers[tindex]); + mutex_lock(&nf_log_mutex); + logger = nf_loggers[tindex]; if (!logger) table->data = "NONE"; else table->data = logger->name; r = proc_dostring(table, write, filp, buffer, lenp, ppos); - rcu_read_unlock(); + mutex_unlock(&nf_log_mutex); } return r; |