Messages in this thread Patch in this message | | | Date | Tue, 20 Aug 2013 11:41:00 -0700 | From | Greg KH <> | Subject | Re: Linux 3.0.93 |
| |
diff --git a/Makefile b/Makefile index a846aa89..369ce146 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 92 +SUBLEVEL = 93 EXTRAVERSION = NAME = Sneaky Weasel diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 409dd405..874f8ffb 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -700,10 +700,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; @@ -725,9 +721,6 @@ errout: cb->args[0] = i; cb->args[1] = n; - if (need_locking) - genl_unlock(); - return skb->len; }
| |