lkml.org 
[lkml]   [2011]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [64/139] cls_cgroup: Fix crash on module unload
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Herbert Xu <herbert@gondor.apana.org.au>

    [ Upstream commit c00b2c9e79466d61979cd21af526cc6d5d0ee04f ]

    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>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    net/sched/cls_cgroup.c | 2 --
    1 file changed, 2 deletions(-)

    Index: linux-2.6.35.y/net/sched/cls_cgroup.c
    ===================================================================
    --- linux-2.6.35.y.orig/net/sched/cls_cgroup.c
    +++ linux-2.6.35.y/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,
    };

    \
     
     \ /
      Last update: 2011-02-02 02:15    [W:4.060 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site