Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 985ef4dc authored Oct 19, 2015 by Dave Chinner Committed by Dave Chinner Oct 19, 2015

xfs: stats are no longer dependent on CONFIG_PROC_FS



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

Reported-and-tested-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

parent 9e92054e

fs/xfs/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,7 @@ xfs-y += xfs_aops.o \
	xfs_message.o \		xfs_message.o \
	xfs_mount.o \		xfs_mount.o \
	xfs_mru_cache.o \		xfs_mru_cache.o \
			xfs_stats.o \
	xfs_super.o \		xfs_super.o \
	xfs_symlink.o \		xfs_symlink.o \
	xfs_sysfs.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_RT) += xfs_rtalloc.o

	xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o		xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
	xfs-$(CONFIG_PROC_FS) += xfs_stats.o
	xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o		xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o
	xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o		xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o
	xfs-$(CONFIG_NFSD_PNFS) += xfs_pnfs.o		xfs-$(CONFIG_NFSD_PNFS) += xfs_pnfs.o

fs/xfs/xfs_stats.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -161,6 +161,7 @@ static const struct file_operations xqmstat_proc_fops = {
	};		};
	#endif /* CONFIG_XFS_QUOTA */		#endif /* CONFIG_XFS_QUOTA */

			#ifdef CONFIG_PROC_FS
	int		int
	xfs_init_procfs(void)		xfs_init_procfs(void)
	{		{
	@@ -191,3 +192,4 @@ xfs_cleanup_procfs(void)
	{		{
	remove_proc_subtree("fs/xfs", NULL);		remove_proc_subtree("fs/xfs", NULL);
	}		}
			#endif /* CONFIG_PROC_FS */