Merge branch 'audit.b3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6-omap-h63xx.git] / fs / xfs / quota / xfs_qm_bhv.c

diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c
index d9d2993de435c76319a6c13dc7a180fb3e9855ed..6838b36d95a9bc283850aef2a12a1d680a8ea6f1 100644 (file)
--- a/fs/xfs/quota/xfs_qm_bhv.c
+++ b/fs/xfs/quota/xfs_qm_bhv.c
@@ -363,7 +363,7 @@ xfs_qm_init(void)
                KERN_INFO "SGI XFS Quota Management subsystem\n";
 
        printk(message);
-       mutex_init(&xfs_Gqm_lock, MUTEX_DEFAULT, "xfs_qmlock");
+       mutex_init(&xfs_Gqm_lock);
        vfs_bhv_set_custom(&xfs_qmops, &xfs_qmcore_xfs);
        xfs_qm_init_procfs();
 }
@@ -374,7 +374,7 @@ xfs_qm_exit(void)
        vfs_bhv_clr_custom(&xfs_qmops);
        xfs_qm_cleanup_procfs();
        if (qm_dqzone)
-               kmem_cache_destroy(qm_dqzone);
+               kmem_zone_destroy(qm_dqzone);
        if (qm_dqtrxzone)
-               kmem_cache_destroy(qm_dqtrxzone);
+               kmem_zone_destroy(qm_dqtrxzone);
 }