Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754649Ab0KDBqP (ORCPT ); Wed, 3 Nov 2010 21:46:15 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:63015 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754411Ab0KDBqN (ORCPT ); Wed, 3 Nov 2010 21:46:13 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=hRqRTENEzq3unoHVekv9bYkb8UB6gJEsfio66kU6OKC5WKrE2h7R6fxAMzDm/Khj7B Xt9tW+KWNjzYfXDTwAoTcdFj3ow1xi5gcj/5TaWOTP/B61OBuyNKoaFJGtYb1SBkJWrM nj0/QkZPnaDCE0THrHBRzUjqo9BDGuXzXjlwc= Message-ID: <4CD2105F.6090900@gmail.com> Date: Thu, 04 Nov 2010 09:46:07 +0800 From: Li Zefan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.11) Gecko/20101006 Thunderbird/3.1.5 MIME-Version: 1.0 To: Herbert Xu CC: Eric Dumazet , Randy Dunlap , Linus Torvalds , Jamal Hadi Salim , Thomas Graf , Linux Kernel Mailing List , netdev , Ben Blum Subject: Re: Linux 2.6.37-rc1 (net/sched: cls_cgroup) References: <20101103142156.73c2d3c9.randy.dunlap@oracle.com> <1288821677.2718.27.camel@edumazet-laptop> <20101103233105.GA26124@gondor.apana.org.au> In-Reply-To: <20101103233105.GA26124@gondor.apana.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1658 Lines: 52 >> 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. > The first patch was merged in .34, and the second one .35, and from the changelog and the diff, seems you did know cls_cgroup can be a module. ;) > 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 > Signed-off-by: Herbert Xu > Reviewed-by: Li Zefan > 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, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/