]> git.hungrycats.org Git - linux/commitdiff
btrfs: don't arbitrarily slow down delalloc if we're committing zygo-6.0.x-zb64
authorJosef Bacik <josef@toxicpanda.com>
Mon, 18 Sep 2023 18:15:33 +0000 (14:15 -0400)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Wed, 29 Nov 2023 14:51:13 +0000 (09:51 -0500)
We have a random schedule_timeout() if the current transaction is
committing, which seems to be a holdover from the original delalloc
reservation code.

Remove this, we have the proper flushing stuff, we shouldn't be hoping
for random timing things to make everything work.  This just induces
latency for no reason.

CC: stable@vger.kernel.org # 5.4+
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
(cherry picked from commit 11aeb97b45ad2e0040cbb2a589bc403152526345)

fs/btrfs/delalloc-space.c

index 1e8f17ff829e3508b9438b5d49666bde40c5582d..024ed273f4ba239cee9468171b6e5ca6e52ab8d0 100644 (file)
@@ -313,9 +313,6 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,
        } else {
                if (current->journal_info)
                        flush = BTRFS_RESERVE_FLUSH_LIMIT;
-
-               if (btrfs_transaction_in_commit(fs_info))
-                       schedule_timeout(1);
        }
 
        num_bytes = ALIGN(num_bytes, fs_info->sectorsize);