From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbZBYSKo (ORCPT ); Wed, 25 Feb 2009 13:10:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751513AbZBYSKg (ORCPT ); Wed, 25 Feb 2009 13:10:36 -0500 Received: from acsinet12.oracle.com ([141.146.126.234]:30636 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751316AbZBYSKf (ORCPT ); Wed, 25 Feb 2009 13:10:35 -0500 Message-ID: <49A589B2.9090003@oracle.com> Date: Wed, 25 Feb 2009 10:10:58 -0800 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: "Serge E. Hallyn" CC: linux-kernel@vger.kernel.org, Andrew Morton Subject: Re: mmotm 2009-02-24-16-23 uploaded (proc_net & namespaces) References: <200902250041.n1P0fe4A024914@imap1.linux-foundation.org> <49A5778E.1000204@oracle.com> <20090225171748.GC14463@us.ibm.com> <49A57FA7.407@oracle.com> <20090225174747.GA19750@us.ibm.com> In-Reply-To: <20090225174747.GA19750@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsmt700.oracle.com [141.146.40.70] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090209.49A5896C.02F3:SCFSTAT928724,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Serge E. Hallyn wrote: > Quoting Randy Dunlap (randy.dunlap@oracle.com): >> Serge E. Hallyn wrote: >>> Quoting Randy Dunlap (randy.dunlap@oracle.com): >>>> akpm@linux-foundation.org wrote: >>>>> The mm-of-the-moment snapshot 2009-02-24-16-23 has been uploaded to >>>>> >>>>> http://userweb.kernel.org/~akpm/mmotm/ >>>>> >>>>> and will soon be available at >>>>> >>>>> git://git.zen-sources.org/zen/mmotm.git >>>>> >>>>> It contains the following patches against 2.6.29-rc6: >>>> namespaces-move-proc_net_get_sb-to-a-generic-fs-superc-helper.patch, >>>> when CONFIG_NAMESPACES=n: >>>> >>>> proc_net.c:(.text+0x4255c): undefined reference to `get_sb_ns' >>>> >>>> >>>> config attached. >>> Thanks, Randy. Does the following fix it? >>> >>> (Sorry, it's a misleading patch, and maybe it would turn out more >>> readable if I moved get_sb_ns under instead of above the >>> CONFIG_BLOCK ifdef... But all I'm doing is what the subject says, >>> plus adding an EXPORT_SYMBOL which may be debatable, but is in >>> keeping with other get_sb_*'s.) >> That causes problems in fs/super.c: >> >> fs/super.c: In function 'get_sb_ns': >> fs/super.c:773: error: 'ns_test_super' undeclared (first use in this function) > > (!) I appended the wrong version. Yes, this one works. Thanks. > From 9f5d2c853f4b3e50621591856c11a565a733fb3d Mon Sep 17 00:00:00 2001 > From: Serge E. Hallyn > Date: Wed, 25 Feb 2009 09:14:03 -0800 > Subject: [PATCH 1/1] namespaces: get_sb_ns does not require CONFIG_BLOCK > > So move it outside of the CONFIG_BLOCK ifdef in fs/super.c. > > Signed-off-by: Serge E. Hallyn > --- > fs/super.c | 28 +++++++++++++++------------- > 1 files changed, 15 insertions(+), 13 deletions(-) > > diff --git a/fs/super.c b/fs/super.c > index 1a37b58..5182044 100644 > --- a/fs/super.c > +++ b/fs/super.c > @@ -761,19 +761,6 @@ void kill_litter_super(struct super_block *sb) > > EXPORT_SYMBOL(kill_litter_super); > > -#ifdef CONFIG_BLOCK > -static int set_bdev_super(struct super_block *s, void *data) > -{ > - s->s_bdev = data; > - s->s_dev = s->s_bdev->bd_dev; > - return 0; > -} > - > -static int test_bdev_super(struct super_block *s, void *data) > -{ > - return (void *)s->s_bdev == data; > -} > - > static int ns_test_super(struct super_block *sb, void *data) > { > return sb->s_fs_info == data; > @@ -812,6 +799,21 @@ int get_sb_ns(struct file_system_type *fs_type, int flags, void *data, > return 0; > } > > +EXPORT_SYMBOL(get_sb_ns); > + > +#ifdef CONFIG_BLOCK > +static int set_bdev_super(struct super_block *s, void *data) > +{ > + s->s_bdev = data; > + s->s_dev = s->s_bdev->bd_dev; > + return 0; > +} > + > +static int test_bdev_super(struct super_block *s, void *data) > +{ > + return (void *)s->s_bdev == data; > +} > + > int get_sb_bdev(struct file_system_type *fs_type, > int flags, const char *dev_name, void *data, > int (*fill_super)(struct super_block *, void *, int), -- ~Randy