diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-10-24 06:48:39 -0700 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-11-28 16:00:27 -0800 |
commit | ffa53c5863ddb265f9a25729023f4d0409cdacf7 (patch) | |
tree | 8f7b2534bd6ccbc43a7cb91690df2ae4d3145a56 | |
parent | 2fe2582649aa2355f79acddb86bd4d6c5363eb63 (diff) | |
download | linux-stable-ffa53c5863ddb265f9a25729023f4d0409cdacf7.tar.gz linux-stable-ffa53c5863ddb265f9a25729023f4d0409cdacf7.tar.bz2 linux-stable-ffa53c5863ddb265f9a25729023f4d0409cdacf7.zip |
netfilter: Eliminate cond_resched_rcu_qs() in favor of cond_resched()
Now that cond_resched() also provides RCU quiescent states when
needed, it can be used in place of cond_resched_rcu_qs(). This
commit therefore makes this change.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: Florian Westphal <fw@strlen.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <netfilter-devel@vger.kernel.org>
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 85f643c1e227..4efaa3066c78 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1044,7 +1044,7 @@ static void gc_worker(struct work_struct *work) * we will just continue with next hash slot. */ rcu_read_unlock(); - cond_resched_rcu_qs(); + cond_resched(); } while (++buckets < goal); if (gc_work->exiting) |