Btrfs: Throttle less often waiting for snapshots to delete

[linux-2.6-block.git] / fs / btrfs / extent-tree.c

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 58bceeeda9c5db7d02baa47d2135bfdd8a1f546c..74bcd48a9c43a6d0b25da1ee3915d1c6aade3dfa 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2535,6 +2535,10 @@ static int noinline walk_down_tree(struct btrfs_trans_handle *trans,
                                                root_gen, 0, 0, 1);
                        BUG_ON(ret);
                        mutex_unlock(&root->fs_info->alloc_mutex);
+
+                       atomic_inc(&root->fs_info->throttle_gen);
+                       wake_up(&root->fs_info->transaction_throttle);
+
                        continue;
                }
                /*
@@ -2603,7 +2607,6 @@ out:
        root_owner = btrfs_header_owner(parent);
        root_gen = btrfs_header_generation(parent);
 
-
        mutex_lock(&root->fs_info->alloc_mutex);
        ret = __btrfs_free_extent(trans, root, bytenr, blocksize,
                                  root_owner, root_gen, 0, 0, 1);
@@ -2726,7 +2729,6 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
                }
        }
        while(1) {
-               atomic_inc(&root->fs_info->throttle_gen);
                wret = walk_down_tree(trans, root, path, &level);
                if (wret > 0)
                        break;
@@ -2742,6 +2744,7 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
                        ret = -EAGAIN;
                        break;
                }
+               atomic_inc(&root->fs_info->throttle_gen);
                wake_up(&root->fs_info->transaction_throttle);
        }
        for (i = 0; i <= orig_level; i++) {