summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorKoichiro Den <koichiro.den@canonical.com>2025-02-07 01:22:16 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-02-17 10:05:46 +0100
commit118b41e78b0ad47f257b0dfbcb7956f3b0b6cf7d (patch)
tree67b8940142097fd7f003217939d06396adda901c /fs/btrfs
parent38939faa290b9ac60fd754db6127047d4a79361b (diff)
Revert "btrfs: avoid monopolizing a core when activating a swap file"
This reverts commit 9f372e86b9bd1914df58c8f6e30939b7a224c6b0. The backport for linux-6.12.y, commit 9f372e86b9bd ("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: 9f372e86b9bd ("btrfs: avoid monopolizing a core when activating a swap file") # linux-6.12.y Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/inode.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 9d9ce308488dd..197ba9be97187 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7200,8 +7200,6 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
ret = -EAGAIN;
goto out;
}
-
- cond_resched();
}
if (file_extent)