aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-12 22:16:33 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-12 22:16:33 -0800
commit910d6c320cac65c81d66e8fd30dca167092722eb (patch)
tree8c15459ad21e293081636c535945682a079d51cf /net/netlink
parent4c3a0a254e5d706d3fe01bf42261534858d05586 (diff)
downloadkernel_samsung_smdk4412-910d6c320cac65c81d66e8fd30dca167092722eb.zip
kernel_samsung_smdk4412-910d6c320cac65c81d66e8fd30dca167092722eb.tar.gz
kernel_samsung_smdk4412-910d6c320cac65c81d66e8fd30dca167092722eb.tar.bz2
[GENETLINK]: Relax dances with genl_lock.
The genl_unregister_family() calls the genl_unregister_mc_groups(), which takes and releases the genl_lock and then locks and releases this lock itself. Relax this behavior, all the more so the genl_unregister_mc_groups() is called from genl_unregister_family() only. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/genetlink.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 150579a..d16929c 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -230,10 +230,8 @@ static void genl_unregister_mc_groups(struct genl_family *family)
{
struct genl_multicast_group *grp, *tmp;
- genl_lock();
list_for_each_entry_safe(grp, tmp, &family->mcast_groups, list)
__genl_unregister_mc_group(family, grp);
- genl_unlock();
}
/**
@@ -396,10 +394,10 @@ int genl_unregister_family(struct genl_family *family)
{
struct genl_family *rc;
- genl_unregister_mc_groups(family);
-
genl_lock();
+ genl_unregister_mc_groups(family);
+
list_for_each_entry(rc, genl_family_chain(family->id), family_list) {
if (family->id != rc->id || strcmp(rc->name, family->name))
continue;