linux-kernel - Re: randconfig build error with next-20151013, in fs/xfs/libxfs/xfs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+r1ZhiKiVja7vm5F-mmtq3xVm4gufGW1fFuF6FD7RpU17T6PA@mail.gmail.com>
Date:	Tue, 13 Oct 2015 14:08:28 -0700
From:	Jim Davis <jim.epost@...il.com>
To:	Dave Chinner <david@...morbit.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next <linux-next@...r.kernel.org>,
	linux-kernel <linux-kernel@...r.kernel.org>, xfs@....sgi.com
Subject: Re: randconfig build error with next-20151013, in fs/xfs/libxfs/xfs_alloc.c

On Tue, Oct 13, 2015 at 1:41 PM, Dave Chinner <david@...morbit.com> wrote:
> On Tue, Oct 13, 2015 at 09:41:25AM -0700, Jim Davis wrote:
>> Building with the attached random configuration file,
>>
>> fs/built-in.o: In function `xfs_free_ag_extent':
>> /home/jim/linux-next/fs/xfs/libxfs/xfs_alloc.c:1813: undefined
>> reference to `xfsstats'
>
> Please test the patch below.
>
> -Dave.
> --
> Dave Chinner
> david@...morbit.com
>
>
> xfs: stats are no longer dependent on CONFIG_PROC_FS
>
> From: Dave Chinner <dchinner@...hat.com>
>
> So we need to fix the makefile to understand this, otherwise build
> errors with CONFIG_PROC_FS=n occur.
>
> Reported-by: Jim Davis <jim.epost@...il.com>
> Signed-off-by: Dave Chinner <dchinner@...hat.com>
> ---
>  fs/xfs/Makefile    | 2 +-
>  fs/xfs/xfs_stats.c | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
> index 2fbf910..6506e87 100644
> --- a/fs/xfs/Makefile
> +++ b/fs/xfs/Makefile
> @@ -84,6 +84,7 @@ xfs-y                         += xfs_aops.o \
>                                    xfs_message.o \
>                                    xfs_mount.o \
>                                    xfs_mru_cache.o \
> +                                  xfs_stats.o \
>                                    xfs_super.o \
>                                    xfs_symlink.o \
>                                    xfs_sysfs.o \
> @@ -118,7 +119,6 @@ xfs-$(CONFIG_XFS_QUOTA)             += xfs_dquot.o \
>  xfs-$(CONFIG_XFS_RT)           += xfs_rtalloc.o
>
>  xfs-$(CONFIG_XFS_POSIX_ACL)    += xfs_acl.o
> -xfs-$(CONFIG_PROC_FS)          += xfs_stats.o
>  xfs-$(CONFIG_SYSCTL)           += xfs_sysctl.o
>  xfs-$(CONFIG_COMPAT)           += xfs_ioctl32.o
>  xfs-$(CONFIG_NFSD_PNFS)                += xfs_pnfs.o
> diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c
> index bd50619..8686df6 100644
> --- a/fs/xfs/xfs_stats.c
> +++ b/fs/xfs/xfs_stats.c
> @@ -161,6 +161,7 @@ static const struct file_operations xqmstat_proc_fops = {
>  };
>  #endif /* CONFIG_XFS_QUOTA */
>
> +#ifdef CONFIG_PROC_FS
>  int
>  xfs_init_procfs(void)
>  {
> @@ -191,3 +192,4 @@ xfs_cleanup_procfs(void)
>  {
>         remove_proc_subtree("fs/xfs", NULL);
>  }
> +#endif /* CONFIG_PROC_FS */

Looks good!  Thanks.

Tested-by: Jim Davis <jim.epost@...il.com>

-- 
Jim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/