net/netfilter: refactor notifier registration
Subsystems (2)
PATCH v2 1/1 net/netfilter: refactor notifier registration
* ret variable initialization removed as useless
* similar code strings concatenated and functions code flow became more plain
Signed-off-by Tony Zelenoff <[email protected]>
--- net/netfilter/nf_conntrack_ecache.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
net/netfilter/nf_conntrack_ecache.c +4 -6
@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(nf_ct_deliver_cached_events);int nf_conntrack_register_notifier (struct net *net,struct nf_ct_event_notifier *new) { -int ret =0 ; +int ret;struct nf_ct_event_notifier *notify;mutex_lock (&nf_ct_ecache_mutex);
@@ -95,8 +95,7 @@ int nf_conntrack_register_notifier(struct net *net, goto out_unlock; }rcu_assign_pointer (net->ct.nf_conntrack_event_cb, new); -mutex_unlock (&nf_ct_ecache_mutex); -return ret; + ret =0 ; out_unlock:mutex_unlock (&nf_ct_ecache_mutex);
@@ -121,7 +120,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier);int nf_ct_expect_register_notifier (struct net *net,struct nf_exp_event_notifier *new) { -int ret =0 ; +int ret;struct nf_exp_event_notifier *notify;mutex_lock (&nf_ct_ecache_mutex);
@@ -132,8 +131,7 @@ int nf_ct_expect_register_notifier(struct net *net, goto out_unlock; }rcu_assign_pointer (net->ct.nf_expect_event_cb, new); -mutex_unlock (&nf_ct_ecache_mutex); -return ret; + ret =0 ; out_unlock:mutex_unlock (&nf_ct_ecache_mutex);
Signature · 1 line
1.7.1
Pablo Neira Ayuso
maintainerQuoted 5 lines · Tony Zelenoff
* ret variable initialization removed as useless
* similar code strings concatenated and functions code flow became more plainSigned-off-by Tony Zelenoff <[email protected]>
It took some time, but finally applied to Netfilter's net-next tree. Thanks.