diff options
author | Dave Chinner <dchinner@redhat.com> | 2014-09-28 20:46:08 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-09-28 20:46:08 -0400 |
commit | e3aed1a08190c038c4ea41b73ea6f07bc0e3290c (patch) | |
tree | 2b9eb6ea06405bfd1f978a76575cd9426f106829 /fs/xfs | |
parent | bf1ed3833078e3bb0ba8cd03468090b9359d0912 (diff) |
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>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_mount.c | 3 | ||||
-rw-r--r-- | fs/xfs/xfs_super.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index fbf0384a466f..d36bdbc9eeb2 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -61,8 +61,6 @@ static DEFINE_MUTEX(xfs_uuid_table_mutex); | |||
61 | static int xfs_uuid_table_size; | 61 | static int xfs_uuid_table_size; |
62 | static uuid_t *xfs_uuid_table; | 62 | static uuid_t *xfs_uuid_table; |
63 | 63 | ||
64 | extern struct kset *xfs_kset; | ||
65 | |||
66 | /* | 64 | /* |
67 | * See if the UUID is unique among mounted XFS filesystems. | 65 | * See if the UUID is unique among mounted XFS filesystems. |
68 | * Mount fails if UUID is nil or a FS with the same UUID is already mounted. | 66 | * Mount fails if UUID is nil or a FS with the same UUID is already mounted. |
@@ -729,7 +727,6 @@ xfs_mountfs( | |||
729 | 727 | ||
730 | xfs_set_maxicount(mp); | 728 | xfs_set_maxicount(mp); |
731 | 729 | ||
732 | mp->m_kobj.kobject.kset = xfs_kset; | ||
733 | error = xfs_sysfs_init(&mp->m_kobj, &xfs_mp_ktype, NULL, mp->m_fsname); | 730 | error = xfs_sysfs_init(&mp->m_kobj, &xfs_mp_ktype, NULL, mp->m_fsname); |
734 | if (error) | 731 | if (error) |
735 | goto out; | 732 | goto out; |
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index dcd4b93dccdc..9f622feda6a4 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c | |||
@@ -63,7 +63,7 @@ static const struct super_operations xfs_super_operations; | |||
63 | static kmem_zone_t *xfs_ioend_zone; | 63 | static kmem_zone_t *xfs_ioend_zone; |
64 | mempool_t *xfs_ioend_pool; | 64 | mempool_t *xfs_ioend_pool; |
65 | 65 | ||
66 | struct kset *xfs_kset; /* top-level xfs sysfs dir */ | 66 | static struct kset *xfs_kset; /* top-level xfs sysfs dir */ |
67 | #ifdef DEBUG | 67 | #ifdef DEBUG |
68 | static struct xfs_kobj xfs_dbg_kobj; /* global debug sysfs attrs */ | 68 | static struct xfs_kobj xfs_dbg_kobj; /* global debug sysfs attrs */ |
69 | #endif | 69 | #endif |
@@ -1411,6 +1411,7 @@ xfs_fs_fill_super( | |||
1411 | atomic_set(&mp->m_active_trans, 0); | 1411 | atomic_set(&mp->m_active_trans, 0); |
1412 | INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker); | 1412 | INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker); |
1413 | INIT_DELAYED_WORK(&mp->m_eofblocks_work, xfs_eofblocks_worker); | 1413 | INIT_DELAYED_WORK(&mp->m_eofblocks_work, xfs_eofblocks_worker); |
1414 | mp->m_kobj.kobject.kset = xfs_kset; | ||
1414 | 1415 | ||
1415 | mp->m_super = sb; | 1416 | mp->m_super = sb; |
1416 | sb->s_fs_info = mp; | 1417 | sb->s_fs_info = mp; |