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

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>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 560c4f2a18334..45c1732a9677d 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);