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>

1 files changed, 7 insertions, 3 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index e9ad7894648..06d23b976f4 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();