Revert "btrfs: avoid monopolizing a core when activating a swap file"

This reverts commit 214d92f0a465f93eea15e702e743f2c63823b1fd.

The backport for linux-5.15.y, commit 214d92f0a465 ("btrfs: avoid
monopolizing a core when activating a swap file"), inserted
cond_resched() in the wrong location.

Revert it now; a subsequent commit will re-backport the original patch.

Fixes: 214d92f0a465 ("btrfs: avoid monopolizing a core when activating a swap file") # linux-5.15.y
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index a6b1dd8340600713773674e3de7eb5b7eec5adfc..8f048e517e656ed1b2b123531f867e23a5a9bde1 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7698,8 +7698,6 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
                        ret = -EAGAIN;
                        goto out;
                }
-
-               cond_resched();
        }
 
        btrfs_release_path(path);