]> git.hungrycats.org Git - linux/commitdiff
Revert "btrfs: preallocate compression workspaces" zygo-4.6.x-zb64
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Wed, 17 Aug 2016 02:51:31 +0000 (22:51 -0400)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Wed, 17 Aug 2016 02:51:31 +0000 (22:51 -0400)
This reverts commit 4f55309a0388d7f59542fabd03bd6f8c57722096.

fs/btrfs/compression.c

index c134f91f69d6605419c04ad4237700e13d1beb34..363a9640e0c1ff7ce5f9e5694446f8b3031fbae5 100644 (file)
@@ -764,26 +764,10 @@ void __init btrfs_init_compress(void)
        int i;
 
        for (i = 0; i < BTRFS_COMPRESS_TYPES; i++) {
-               struct list_head *workspace;
-
                INIT_LIST_HEAD(&btrfs_comp_ws[i].idle_ws);
                spin_lock_init(&btrfs_comp_ws[i].ws_lock);
                atomic_set(&btrfs_comp_ws[i].alloc_ws, 0);
                init_waitqueue_head(&btrfs_comp_ws[i].ws_wait);
-
-               /*
-                * Preallocate one workspace for each compression type so
-                * we can guarantee forward progress in the worst case
-                */
-               workspace = btrfs_compress_op[i]->alloc_workspace();
-               if (IS_ERR(workspace)) {
-                       printk(KERN_WARNING
-       "BTRFS: cannot preallocate compression workspace, will try later");
-               } else {
-                       atomic_set(&btrfs_comp_ws[i].total_ws, 1);
-                       btrfs_comp_ws[i].free_ws = 1;
-                       list_add(workspace, &btrfs_comp_ws[i].idle_ws);
-               }
        }
 }