diff options
author | Koichiro Den <koichiro.den@canonical.com> | 2025-02-07 01:20:54 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-21 13:49:55 +0100 |
commit | 8c481939fb1db8fcbafef19cee330bbd898075d7 (patch) | |
tree | 4c830d6225a3ddb4f76b8f113d2d50b694af50dc | |
parent | 91932db1d96b2952299ce30c1c693d834d10ace6 (diff) | |
download | linux-8c481939fb1db8fcbafef19cee330bbd898075d7.tar.gz linux-8c481939fb1db8fcbafef19cee330bbd898075d7.tar.bz2 linux-8c481939fb1db8fcbafef19cee330bbd898075d7.zip |
Revert "btrfs: avoid monopolizing a core when activating a swap file"
This reverts commit bb8e287f596b62fac18ed84cc03a9f1752f6b3b8.
The backport for linux-6.1.y, commit bb8e287f596b ("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: bb8e287f596b ("btrfs: avoid monopolizing a core when activating a swap file") # linux-6.1.y
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b2cded5bf69c..f4a754d62bf4 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7387,8 +7387,6 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, ret = -EAGAIN; goto out; } - - cond_resched(); } if (orig_start) |