Commit de8b21d4 authored by Koichiro Den's avatar Koichiro Den Committed by Wentao Guan
Browse files

Revert "btrfs: avoid monopolizing a core when activating a swap file" 

stable inclusion
from stable-v6.6.78
commit b4e355e70e12aac855950323eb9f45f1586a5e5e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBX1M5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b4e355e70e12aac855950323eb9f45f1586a5e5e



--------------------------------

This reverts commit 6e1a8225930719a9f352d56320214e33e2dde0a6.

The backport for linux-6.6.y, commit 6e1a82259307 ("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: 6e1a82259307 ("btrfs: avoid monopolizing a core when activating a swap file") # linux-6.6.y
Signed-off-by: default avatarKoichiro Den <koichiro.den@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit b4e355e70e12aac855950323eb9f45f1586a5e5e)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 087927b5

fs/btrfs/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -7157,8 +7157,6 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, 
			ret = -EAGAIN;

			goto out;

		}



		cond_resched();

	}



	if (orig_start)