aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-07-21 19:15:56 +0200
committerDavid Sterba <dsterba@suse.com>2017-07-21 19:15:56 +0200
commitaf373e8aa0563a1656d6a906349bea96f5f342f1 (patch)
tree1f8330de289409f77bf2a34e77a93ef19aab6166 /fs
parent5eb1d8d101fabfb83638b36b6fa30a3dadfb52a3 (diff)
parent343a0aceca392a6ff351130d66ab3bbd3f530b47 (diff)
Merge branch 'ext/omar/shrink-delalloc-no-overcommit' into for-next-next-v4.14-20170721
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index cd25c98529fc..be3e43b1aa61 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4817,10 +4817,6 @@ skip_async:
else
flush = BTRFS_RESERVE_NO_FLUSH;
spin_lock(&space_info->lock);
- if (can_overcommit(fs_info, space_info, orig, flush, false)) {
- spin_unlock(&space_info->lock);
- break;
- }
if (list_empty(&space_info->tickets) &&
list_empty(&space_info->priority_tickets)) {
spin_unlock(&space_info->lock);