Commit e3aed1a0 authored Sep 29, 2014 by Dave Chinner Committed by Dave Chinner Sep 29, 2014

xfs: xfs_kset should be static



As it is accessed through the struct xfs_mount and can be set up
entirely from fs/xfs/xfs_super.c

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

parent bf1ed383

fs/xfs/xfs_mount.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -61,8 +61,6 @@ static DEFINE_MUTEX(xfs_uuid_table_mutex);
		static int xfs_uuid_table_size;
		static uuid_t *xfs_uuid_table;

		extern struct kset *xfs_kset;

		/*
		* See if the UUID is unique among mounted XFS filesystems.
		* Mount fails if UUID is nil or a FS with the same UUID is already mounted.
		@@ -729,7 +727,6 @@ xfs_mountfs(

		xfs_set_maxicount(mp);

		mp->m_kobj.kobject.kset = xfs_kset;
		error = xfs_sysfs_init(&mp->m_kobj, &xfs_mp_ktype, NULL, mp->m_fsname);
		if (error)
		goto out;

fs/xfs/xfs_super.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ static const struct super_operations xfs_super_operations;
		static kmem_zone_t *xfs_ioend_zone;
		mempool_t *xfs_ioend_pool;

		struct kset xfs_kset; / top-level xfs sysfs dir */
		static struct kset xfs_kset; / top-level xfs sysfs dir */
		#ifdef DEBUG
		static struct xfs_kobj xfs_dbg_kobj; /* global debug sysfs attrs */
		#endif
		@@ -1411,6 +1411,7 @@ xfs_fs_fill_super(
		atomic_set(&mp->m_active_trans, 0);
		INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker);
		INIT_DELAYED_WORK(&mp->m_eofblocks_work, xfs_eofblocks_worker);
		mp->m_kobj.kobject.kset = xfs_kset;

		mp->m_super = sb;
		sb->s_fs_info = mp;