Messages in this thread Patch in this message | | | Date | Wed, 3 Nov 2010 18:31:05 -0500 | From | Herbert Xu <> | Subject | Re: Linux 2.6.37-rc1 (net/sched: cls_cgroup) |
| |
On Wed, Nov 03, 2010 at 11:01:17PM +0100, Eric Dumazet wrote: > > commits 8e039d84b323c450 > (cgroups: net_cls as module) > > followed by commit f845172531f > (cls_cgroup: Store classid in struct sock)
Indeed, it looks like the tree I worked on didn't have the first patch applied for some reason.
Anyway, this patch should fix the problem. Thanks Eric!
cls_cgroup: Fix crash on module unload
Somewhere along the lines net_cls_subsys_id became a macro when cls_cgroup is built as a module. Not only did it make cls_cgroup completely useless, it also causes it to crash on module unload.
This patch fixes this by removing that macro.
Thanks to Eric Dumazet for diagnosing this problem.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 37dff78..d49c40f 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -34,8 +34,6 @@ struct cgroup_subsys net_cls_subsys = { .populate = cgrp_populate, #ifdef CONFIG_NET_CLS_CGROUP .subsys_id = net_cls_subsys_id, -#else -#define net_cls_subsys_id net_cls_subsys.subsys_id #endif .module = THIS_MODULE, }; Cheers, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
| |