Thread (4 messages) 4 messages, 2 authors, 2015-10-13

Re: randconfig build error with next-20151013, in fs/xfs/libxfs/xfs_alloc.c

From: Jim Davis <hidden>
Date: 2015-10-13 21:08:33
Also in: linux-xfs, lkml

On Tue, Oct 13, 2015 at 1:41 PM, Dave Chinner [off-list ref] wrote:
quoted hunk ↗ jump to hunk
On Tue, Oct 13, 2015 at 09:41:25AM -0700, Jim Davis wrote:
quoted
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@fromorbit.com


xfs: stats are no longer dependent on CONFIG_PROC_FS

From: Dave Chinner <redacted>

So we need to fix the makefile to understand this, otherwise build
errors with CONFIG_PROC_FS=n occur.

Reported-by: Jim Davis <redacted>
Signed-off-by: Dave Chinner <redacted>
---
 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 <redacted>

-- 
Jim

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help