Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[sfrench/cifs-2.6.git] / fs / ocfs2 / super.c

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 0e4083987d2bf8c0b3daed879041a0e4df1af9dd..69fa11b35aa4ccd821729a0460d68d7b1ee72d83 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1645,16 +1645,11 @@ static int __init ocfs2_init(void)
                mlog(ML_ERROR, "Unable to create ocfs2 debugfs root.\n");
        }
 
                mlog(ML_ERROR, "Unable to create ocfs2 debugfs root.\n");
        }
 

-       status = ocfs2_quota_setup();
-       if (status)
-               goto leave;
-

        ocfs2_set_locking_protocol();
 
        status = register_quota_format(&ocfs2_quota_format);
 leave:
        if (status < 0) {
        ocfs2_set_locking_protocol();
 
        status = register_quota_format(&ocfs2_quota_format);
 leave:
        if (status < 0) {

-               ocfs2_quota_shutdown();

                ocfs2_free_mem_caches();
                exit_ocfs2_uptodate_cache();
                mlog_errno(status);
                ocfs2_free_mem_caches();
                exit_ocfs2_uptodate_cache();
                mlog_errno(status);


@@ -1668,8 +1663,6 @@ leave:
 
 static void __exit ocfs2_exit(void)
 {
 
 static void __exit ocfs2_exit(void)
 {

-       ocfs2_quota_shutdown();
-

        if (ocfs2_wq) {
                flush_workqueue(ocfs2_wq);
                destroy_workqueue(ocfs2_wq);
        if (ocfs2_wq) {
                flush_workqueue(ocfs2_wq);
                destroy_workqueue(ocfs2_wq);