Commit-ID:  ffa53c5863ddb265f9a25729023f4d0409cdacf7
Gitweb:     https://git.kernel.org/tip/ffa53c5863ddb265f9a25729023f4d0409cdacf7
Author:     Paul E. McKenney <[email protected]>
AuthorDate: Tue, 24 Oct 2017 06:48:39 -0700
Committer:  Paul E. McKenney <[email protected]>
CommitDate: Tue, 28 Nov 2017 16:00:27 -0800

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 <[email protected]>
Cc: Pablo Neira Ayuso <[email protected]>
Cc: Jozsef Kadlecsik <[email protected]>
Cc: Florian Westphal <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: <[email protected]>
---
 net/netfilter/nf_conntrack_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_conntrack_core.c 
b/net/netfilter/nf_conntrack_core.c
index 85f643c..4efaa30 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)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to