Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / net / netfilter / nf_tables_api.c

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 9340b976d85ca55a890b97a95547f6a3c1d0e9dd..062b73a83af0efd2537669ec515312f50815d041 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1557,8 +1557,9 @@ static void nft_chain_stats_replace(struct nft_trans *trans)
        if (!nft_trans_chain_stats(trans))
                return;
 
-       rcu_swap_protected(chain->stats, nft_trans_chain_stats(trans),
-                          lockdep_commit_lock_is_held(trans->ctx.net));
+       nft_trans_chain_stats(trans) =
+               rcu_replace_pointer(chain->stats, nft_trans_chain_stats(trans),
+                                   lockdep_commit_lock_is_held(trans->ctx.net));
 
        if (!nft_trans_chain_stats(trans))
                static_branch_inc(&nft_counters_enabled);
@@ -5975,16 +5976,22 @@ nft_flowtable_type_get(struct net *net, u8 family)
        return ERR_PTR(-ENOENT);
 }
 
+static void nft_unregister_flowtable_hook(struct net *net,
+                                         struct nft_flowtable *flowtable,
+                                         struct nft_hook *hook)
+{
+       nf_unregister_net_hook(net, &hook->ops);
+       flowtable->data.type->setup(&flowtable->data, hook->ops.dev,
+                                   FLOW_BLOCK_UNBIND);
+}
+
 static void nft_unregister_flowtable_net_hooks(struct net *net,
                                               struct nft_flowtable *flowtable)
 {
        struct nft_hook *hook;
 
-       list_for_each_entry(hook, &flowtable->hook_list, list) {
-               nf_unregister_net_hook(net, &hook->ops);
-               flowtable->data.type->setup(&flowtable->data, hook->ops.dev,
-                                           FLOW_BLOCK_UNBIND);
-       }
+       list_for_each_entry(hook, &flowtable->hook_list, list)
+               nft_unregister_flowtable_hook(net, flowtable, hook);
 }
 
 static int nft_register_flowtable_net_hooks(struct net *net,
@@ -6030,9 +6037,7 @@ err_unregister_net_hooks:
                if (i-- <= 0)
                        break;
 
-               nf_unregister_net_hook(net, &hook->ops);
-               flowtable->data.type->setup(&flowtable->data, hook->ops.dev,
-                                           FLOW_BLOCK_UNBIND);
+               nft_unregister_flowtable_hook(net, flowtable, hook);
                list_del_rcu(&hook->list);
                kfree_rcu(hook, rcu);
        }
@@ -6139,7 +6144,7 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk,
        return 0;
 err5:
        list_for_each_entry_safe(hook, next, &flowtable->hook_list, list) {
-               nf_unregister_net_hook(net, &hook->ops);
+               nft_unregister_flowtable_hook(net, flowtable, hook);
                list_del_rcu(&hook->list);
                kfree_rcu(hook, rcu);
        }
@@ -6484,7 +6489,7 @@ static void nft_flowtable_event(unsigned long event, struct net_device *dev,
                if (hook->ops.dev != dev)
                        continue;
 
-               nf_unregister_net_hook(dev_net(dev), &hook->ops);
+               nft_unregister_flowtable_hook(dev_net(dev), flowtable, hook);
                list_del_rcu(&hook->list);
                kfree_rcu(hook, rcu);
                break;