From: Koichiro Den <koichiro.den@canonical.com>
Date: Thu, 6 Feb 2025 16:20:22 +0000 (+0900)
Subject: Revert "btrfs: avoid monopolizing a core when activating a swap file"
X-Git-Tag: v5.15.179~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc550af962b72e41957dec547cd85b222f7140a2;p=thirdparty%2Fkernel%2Fstable.git

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 a6b1dd8340600..8f048e517e656 100644
--- 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);