diff options
author | Dave Chinner <dchinner@redhat.com> | 2015-10-18 17:42:46 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-10-18 17:42:46 -0400 |
commit | 985ef4dcf94ac0113e2b32ef86bdd5bc47c016b3 (patch) | |
tree | 7f680b71b99c251f4bcf13939ca571c468be3244 | |
parent | 9e92054e8e049f8f4c64d2c6961b2a7e3e13977f (diff) |
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>
-rw-r--r-- | fs/xfs/Makefile | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_stats.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index a096841bd06c..f64639176670 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile | |||
@@ -84,6 +84,7 @@ xfs-y += xfs_aops.o \ | |||
84 | xfs_message.o \ | 84 | xfs_message.o \ |
85 | xfs_mount.o \ | 85 | xfs_mount.o \ |
86 | xfs_mru_cache.o \ | 86 | xfs_mru_cache.o \ |
87 | xfs_stats.o \ | ||
87 | xfs_super.o \ | 88 | xfs_super.o \ |
88 | xfs_symlink.o \ | 89 | xfs_symlink.o \ |
89 | xfs_sysfs.o \ | 90 | xfs_sysfs.o \ |
@@ -118,7 +119,6 @@ xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \ | |||
118 | xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o | 119 | xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o |
119 | 120 | ||
120 | xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o | 121 | xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o |
121 | xfs-$(CONFIG_PROC_FS) += xfs_stats.o | ||
122 | xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o | 122 | xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o |
123 | xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o | 123 | xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o |
124 | xfs-$(CONFIG_NFSD_PNFS) += xfs_pnfs.o | 124 | xfs-$(CONFIG_NFSD_PNFS) += xfs_pnfs.o |
diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c index bd50619fa8c9..8686df6c7609 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 = { | |||
161 | }; | 161 | }; |
162 | #endif /* CONFIG_XFS_QUOTA */ | 162 | #endif /* CONFIG_XFS_QUOTA */ |
163 | 163 | ||
164 | #ifdef CONFIG_PROC_FS | ||
164 | int | 165 | int |
165 | xfs_init_procfs(void) | 166 | xfs_init_procfs(void) |
166 | { | 167 | { |
@@ -191,3 +192,4 @@ xfs_cleanup_procfs(void) | |||
191 | { | 192 | { |
192 | remove_proc_subtree("fs/xfs", NULL); | 193 | remove_proc_subtree("fs/xfs", NULL); |
193 | } | 194 | } |
195 | #endif /* CONFIG_PROC_FS */ | ||