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

Commit fcd8a399 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-stats-fixes' into for-next

parents 1e2103cb f9d460b3

fs/xfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/xfs/xfs_stats.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */

fs/xfs/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}