diff options
| author | Koichiro Den <koichiro.den@canonical.com> | 2025-02-07 01:19:54 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-13 12:47:24 +0100 |
| commit | c093749b9cd76516966eef16dfdc8eb427221403 (patch) | |
| tree | b38f40c1351d37603ae9d497b7b7543626b36dcb /fs | |
| parent | eab8746deb43ddd592276781a023cb2ee58e2ede (diff) | |
| download | linux-c093749b9cd76516966eef16dfdc8eb427221403.tar.gz linux-c093749b9cd76516966eef16dfdc8eb427221403.tar.bz2 linux-c093749b9cd76516966eef16dfdc8eb427221403.zip | |
Revert "btrfs: avoid monopolizing a core when activating a swap file"
This reverts commit a1c3a19446a440c68e80e9c34c5f308ff58aac88.
The backport for linux-5.10.y, commit a1c3a19446a4 ("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: a1c3a19446a4 ("btrfs: avoid monopolizing a core when activating a swap file") # linux-5.10.y
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -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 560c4f2a1833..45c1732a9677 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7127,8 +7127,6 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, ret = -EAGAIN; goto out; } - - cond_resched(); } btrfs_release_path(path); |