ext4: Add batched discard support for ext4

[mv-sheeva.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 8a24e9be7cb0abbb35aaa55f37b5aa8ec22b41b9..01e60aa6c4786ce61b9436b94d8e4777f34397d0 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1189,6 +1189,7 @@ static const struct super_operations ext4_sops = {
        .quota_write    = ext4_quota_write,
 #endif
        .bdev_try_to_free_page = bdev_try_to_free_page,
+       .trim_fs        = ext4_trim_fs
 };
 
 static const struct super_operations ext4_nojournal_sops = {
@@ -4769,9 +4770,12 @@ static int __init init_ext4_fs(void)
        int err;
 
        ext4_check_flag_values();
-       err = init_ext4_system_zone();
+       err = init_ext4_pageio();
        if (err)
                return err;
+       err = init_ext4_system_zone();
+       if (err)
+               goto out5;
        ext4_kset = kset_create_and_add("ext4", NULL, fs_kobj);
        if (!ext4_kset)
                goto out4;
@@ -4812,6 +4816,8 @@ out3:
        kset_unregister(ext4_kset);
 out4:
        exit_ext4_system_zone();
+out5:
+       exit_ext4_pageio();
        return err;
 }
 
@@ -4827,6 +4833,7 @@ static void __exit exit_ext4_fs(void)
        remove_proc_entry("fs/ext4", NULL);
        kset_unregister(ext4_kset);
        exit_ext4_system_zone();
+       exit_ext4_pageio();
 }
 
 MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");