| Message ID | d9a410952c6b88e5855d36f91c06d466d2ce9bed.1395418617.git.rgb@redhat.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Mar 21, 2014 at 12:44:09PM -0400, Richard Guy Briggs wrote: > 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@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(); Applied with minor glitch. Removed the brackets in that if branch. Thanks -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 14/03/24, Pablo Neira Ayuso wrote: > On Fri, Mar 21, 2014 at 12:44:09PM -0400, Richard Guy Briggs wrote: > > 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@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(); > > Applied with minor glitch. Removed the brackets in that if branch. Good point! Thanks. > Thanks - RGB -- Richard Guy Briggs <rbriggs@redhat.com> Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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@redhat.com> --- net/netfilter/nfnetlink.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)