Commit 9291f090 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: ecache: remove another indent level

... by changing:

if (unlikely(ret < 0 || missed)) {
	if (ret < 0) {
to
if (likely(ret >= 0 && !missed))
	goto out;

if (ret < 0) {

After this nf_conntrack_eventmask_report and nf_ct_deliver_cached_events
look pretty much the same, next patch moves common code to a helper.

This patch has no effect on generated code.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 478374a3
...@@ -165,7 +165,9 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, ...@@ -165,7 +165,9 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
goto out_unlock; goto out_unlock;
ret = notify->fcn(eventmask | missed, &item); ret = notify->fcn(eventmask | missed, &item);
if (unlikely(ret < 0 || missed)) { if (likely(ret >= 0 && !missed))
goto out_unlock;
spin_lock_bh(&ct->lock); spin_lock_bh(&ct->lock);
if (ret < 0) { if (ret < 0) {
/* This is a destroy event that has been /* This is a destroy event that has been
...@@ -183,7 +185,7 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, ...@@ -183,7 +185,7 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
e->missed &= ~missed; e->missed &= ~missed;
} }
spin_unlock_bh(&ct->lock); spin_unlock_bh(&ct->lock);
}
out_unlock: out_unlock:
rcu_read_unlock(); rcu_read_unlock();
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment