[PATCH][GENETLINK]: Relax dances with genl_lock.

[PATCH][GENETLINK]: Relax dances with genl_lock.

[Pavel Emelyanov]

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.

I'm not sure, whether this is 2.6.25 material, but the patch looks
pretty simple. Should I hold it till 2.6.26?

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

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;

Re: [PATCH][GENETLINK]: Relax dances with genl_lock.

[David Miller]

From: Pavel Emelyanov <xemul@openvz.org>
Date: Tue, 12 Feb 2008 20:16:13 +0300

> 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>

Ok, applied, thanks.