From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760227AbZBYRSU (ORCPT ); Wed, 25 Feb 2009 12:18:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752665AbZBYRSJ (ORCPT ); Wed, 25 Feb 2009 12:18:09 -0500 Received: from e1.ny.us.ibm.com ([32.97.182.141]:59863 "EHLO e1.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752074AbZBYRSH (ORCPT ); Wed, 25 Feb 2009 12:18:07 -0500 Date: Wed, 25 Feb 2009 11:17:48 -0600 From: "Serge E. Hallyn" To: Randy Dunlap Cc: linux-kernel@vger.kernel.org, Andrew Morton Subject: Re: mmotm 2009-02-24-16-23 uploaded (proc_net & namespaces) Message-ID: <20090225171748.GC14463@us.ibm.com> References: <200902250041.n1P0fe4A024914@imap1.linux-foundation.org> <49A5778E.1000204@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <49A5778E.1000204@oracle.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.) thanks, -serge >>From fff28e37112037efbbc6e44e29bbd741c9dd38a9 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 | 50 ++++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/fs/super.c b/fs/super.c index 1a37b58..b3bf049 100644 --- a/fs/super.c +++ b/fs/super.c @@ -761,30 +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; -} - -static int ns_set_super(struct super_block *sb, void *data) -{ - sb->s_fs_info = data; - return set_anon_super(sb, NULL); -} - int get_sb_ns(struct file_system_type *fs_type, int flags, void *data, int (*fill_super)(struct super_block *, void *, int), struct vfsmount *mnt) @@ -812,6 +788,32 @@ 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; +} + +static int ns_test_super(struct super_block *sb, void *data) +{ + return sb->s_fs_info == data; +} + +static int ns_set_super(struct super_block *sb, void *data) +{ + sb->s_fs_info = data; + return set_anon_super(sb, NULL); +} + 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), -- 1.5.4.3