diff options
author | Christoph Hellwig <hch@infradead.org> | 2012-03-13 08:52:37 +0000 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2012-03-14 12:06:32 -0500 |
commit | a05931ceb0160deadbd7798d60d01b17f2d81b09 (patch) | |
tree | ca56811415e970149cc99b8b7f6ec9a4677d6025 /fs/xfs/xfs_super.c | |
parent | b84a3a96751f93071c1863f2962273973c8b8f5e (diff) | |
download | op-kernel-dev-a05931ceb0160deadbd7798d60d01b17f2d81b09.zip op-kernel-dev-a05931ceb0160deadbd7798d60d01b17f2d81b09.tar.gz |
xfs: remove the global xfs_Gqm structure
If we initialize the slab caches for the quota code when XFS is loaded there
is no need for a global and reference counted quota manager structure. Drop
all this overhead and also fix the error handling during quota initialization.
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r-- | fs/xfs/xfs_super.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e9ad789..06d23b9 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1654,13 +1654,17 @@ init_xfs_fs(void) if (error) goto out_cleanup_procfs; - vfs_initquota(); + error = xfs_qm_init(); + if (error) + goto out_sysctl_unregister; error = register_filesystem(&xfs_fs_type); if (error) - goto out_sysctl_unregister; + goto out_qm_exit; return 0; + out_qm_exit: + xfs_qm_exit(); out_sysctl_unregister: xfs_sysctl_unregister(); out_cleanup_procfs: @@ -1682,7 +1686,7 @@ init_xfs_fs(void) STATIC void __exit exit_xfs_fs(void) { - vfs_exitquota(); + xfs_qm_exit(); unregister_filesystem(&xfs_fs_type); xfs_sysctl_unregister(); xfs_cleanup_procfs(); |