[PATCH] netlink: simplify nfnetlink_bind

Richard Guy Briggs rgb at redhat.com
Fri Mar 21 16:44:09 UTC 2014


Remove duplicity and simplify code flow by moving the rcu_read_unlock() above
the condition and let the flow control exit naturally at the end of the
function.

Signed-off-by: Richard Guy Briggs <rgb at redhat.com>
---
 net/netfilter/nfnetlink.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 046aa13..75619f9 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -399,12 +399,10 @@ static void nfnetlink_bind(int group)
 
 	rcu_read_lock();
 	ss = nfnetlink_get_subsys(type);
+	rcu_read_unlock();
 	if (!ss) {
-		rcu_read_unlock();
 		request_module("nfnetlink-subsys-%d", type);
-		return;
 	}
-	rcu_read_unlock();
 }
 #endif
 
-- 
1.7.1




More information about the Linux-audit mailing list