Skip to content

Commit 17024ad

Browse files
osandovkdave
authored andcommitted
Btrfs: fix early ENOSPC due to delalloc
If a lot of metadata is reserved for outstanding delayed allocations, we rely on shrink_delalloc() to reclaim metadata space in order to fulfill reservation tickets. However, shrink_delalloc() has a shortcut where if it determines that space can be overcommitted, it will stop early. This made sense before the ticketed enospc system, but now it means that shrink_delalloc() will often not reclaim enough space to fulfill any tickets, leading to an early ENOSPC. (Reservation tickets don't care about being able to overcommit, they need every byte accounted for.) Fix it by getting rid of the shortcut so that shrink_delalloc() reclaims all of the metadata it is supposed to. This fixes early ENOSPCs we were seeing when doing a btrfs receive to populate a new filesystem, as well as early ENOSPCs Christoph saw when doing a big cp -r onto Btrfs. Fixes: 957780e ("Btrfs: introduce ticketed enospc infrastructure") Tested-by: Christoph Anton Mitterer <[email protected]> Cc: [email protected] Reviewed-by: Josef Bacik <[email protected]> Signed-off-by: Omar Sandoval <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 1444393 commit 17024ad

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

fs/btrfs/extent-tree.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4825,10 +4825,6 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info, u64 to_reclaim,
48254825
else
48264826
flush = BTRFS_RESERVE_NO_FLUSH;
48274827
spin_lock(&space_info->lock);
4828-
if (can_overcommit(fs_info, space_info, orig, flush, false)) {
4829-
spin_unlock(&space_info->lock);
4830-
break;
4831-
}
48324828
if (list_empty(&space_info->tickets) &&
48334829
list_empty(&space_info->priority_tickets)) {
48344830
spin_unlock(&space_info->lock);

0 commit comments

Comments
 (0)