diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-10-19 09:03:30 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-10-19 09:03:30 +1100 |
| commit | fcd8a399a9d44a637b5ded0eeea14c7933132121 (patch) | |
| tree | 95530bfbf7a937abffec3904c690eb356786fd1c /fs | |
| parent | 1e2103cbf4adfd5490ee5f3ee59750bd70d2047e (diff) | |
| parent | f9d460b341f23a9bb7df8868975fdfcc2e71aa9b (diff) | |
| download | op-kernel-dev-fcd8a399a9d44a637b5ded0eeea14c7933132121.zip op-kernel-dev-fcd8a399a9d44a637b5ded0eeea14c7933132121.tar.gz | |
Merge branch 'xfs-stats-fixes' into for-next
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/Makefile | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_stats.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_super.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index a096841..f646391 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 */ diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 368c55a..b2c252c 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1477,7 +1477,7 @@ xfs_fs_fill_super( /* Allocate stats memory before we do operations that might use it */ mp->m_stats.xs_stats = alloc_percpu(struct xfsstats); if (!mp->m_stats.xs_stats) { - error = PTR_ERR(mp->m_stats.xs_stats); + error = -ENOMEM; goto out_destroy_counters; } |
