lkml.org 
[lkml]   [2013]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Linux 3.10.9
diff --git a/Makefile b/Makefile
index 1a216126..4b31d623 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 10
-SUBLEVEL = 8
+SUBLEVEL = 9
EXTRAVERSION =
NAME = TOSSUG Baby Fish

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index ba6e55d1..1076fe16 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -789,10 +789,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
struct net *net = sock_net(skb->sk);
int chains_to_skip = cb->args[0];
int fams_to_skip = cb->args[1];
- bool need_locking = chains_to_skip || fams_to_skip;
-
- if (need_locking)
- genl_lock();

for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
n = 0;
@@ -814,9 +810,6 @@ errout:
cb->args[0] = i;
cb->args[1] = n;

- if (need_locking)
- genl_unlock();
-
return skb->len;
}


\
 
 \ /
  Last update: 2013-08-21 01:01    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site