From nobody Sun Feb 8 01:31:26 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97A8E2566F7 for ; Fri, 16 Jan 2026 21:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768600246; cv=none; b=mciUmX4qqmMxFR0P1kKXCWh5cG0i6U1ciaEcSjEmhZF9qYIv+7PD6V7DgngVK0kNSJyvz3rEPr64SBRAKIdk7/sCvPnNGG25Fu/dx2spYY2/1skBiT/auMZfdyMaV0rJzDboZPgQBThodEex18fPaPzx0rdS/TOAmIefH+F7gb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768600246; c=relaxed/simple; bh=8imb9l/H9y8epjMETOpvGibEPDP53dhptvPGTDqYUoU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bi/6r+W5pubBPLeQh2Z8cfWFrwCr49vJQDGfsqKq5rNZ53+yWgULqspcL+iNIADaHUY/lODAisn84iWZMjfyzLbL+7Tmn5a02RByCQVl9fQw6Jz+u/rO5RvB4YMOdHCShIkRL/B4E7X8INNIEK9Fu34z86/J2PP6GsarCWvKXug= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B/8m4eRu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B/8m4eRu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37F88C116C6; Fri, 16 Jan 2026 21:50:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768600246; bh=8imb9l/H9y8epjMETOpvGibEPDP53dhptvPGTDqYUoU=; h=From:To:Cc:Subject:Date:From; b=B/8m4eRuqCQ2HgnvWiykZa7XkqZ9R2EZuIDvngGFaalCC6C+rWCbYzJ4l4voKS2RR qAkMXVGdJnBpV2mu9nHKgczjc7OSTJakzhIuu6vI3ee8bOpEI1bcbBqe5LeaEr8pIC AnVF92y9YKUc85tZd77cFId59s/XSxChy/KIqRabSZXIiUeXCRiT/y/d9pkxiZS5FB 9V6DsVjaokn6+6fU6KooShJzlr2q1bJKk664s+OFFdAkx/kRFrabGwH6YQVsX+N6KS ihN3kD4Y0Ul6HQ5ag/YnuN1nlJdqvy3iuWU4bxaojNC3S78EYKIuXuHpVl7XBZFQG9 aNeRylQTcQkVw== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim , stable@kernel.org Subject: [PATCH] Revert "f2fs: add timeout in f2fs_enable_checkpoint()" Date: Fri, 16 Jan 2026 21:50:44 +0000 Message-ID: <20260116215044.2565391-1-jaegeuk@kernel.org> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 4bc347779698b5e67e1514bab105c2c083e55502. For stability, let's keep flushing all the data. Cc: stable@kernel.org Fixes: 4bc347779698 (f2fs: add timeout in f2fs_enable_checkpoint()") Signed-off-by: Jaegeuk Kim Reviewed-by: Chao Yu --- fs/f2fs/f2fs.h | 2 -- fs/f2fs/super.c | 15 ++++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 90aa1d53722a..8c256fcdcf5b 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -311,7 +311,6 @@ enum { #define DEF_CP_INTERVAL 60 /* 60 secs */ #define DEF_IDLE_INTERVAL 5 /* 5 secs */ #define DEF_DISABLE_INTERVAL 5 /* 5 secs */ -#define DEF_ENABLE_INTERVAL 16 /* 16 secs */ #define DEF_DISABLE_QUICK_INTERVAL 1 /* 1 secs */ #define DEF_UMOUNT_DISCARD_TIMEOUT 5 /* 5 secs */ =20 @@ -1482,7 +1481,6 @@ enum { DISCARD_TIME, GC_TIME, DISABLE_TIME, - ENABLE_TIME, UMOUNT_DISCARD_TIMEOUT, MAX_TIME, }; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 25f796232ad9..4869145531cc 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2686,7 +2686,7 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_inf= o *sbi) =20 static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi) { - unsigned int nr_pages =3D get_pages(sbi, F2FS_DIRTY_DATA) / 16; + int retry =3D DEFAULT_RETRY_IO_COUNT; long long start, writeback, end; int ret; struct f2fs_lock_context lc; @@ -2696,22 +2696,16 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_in= fo *sbi) get_pages(sbi, F2FS_DIRTY_NODES), get_pages(sbi, F2FS_DIRTY_DATA)); =20 - f2fs_update_time(sbi, ENABLE_TIME); - start =3D ktime_get(); =20 /* we should flush all the data to keep data consistency */ - while (get_pages(sbi, F2FS_DIRTY_DATA)) { - writeback_inodes_sb_nr(sbi->sb, nr_pages, WB_REASON_SYNC); + do { + sync_inodes_sb(sbi->sb); f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT); + } while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--); =20 - if (f2fs_time_over(sbi, ENABLE_TIME)) - break; - } writeback =3D ktime_get(); =20 - sync_inodes_sb(sbi->sb); - if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA))) f2fs_warn(sbi, "checkpoint=3Denable has some unwritten data: %lld", get_pages(sbi, F2FS_DIRTY_DATA)); @@ -4335,7 +4329,6 @@ static void init_sb_info(struct f2fs_sb_info *sbi) sbi->interval_time[DISCARD_TIME] =3D DEF_IDLE_INTERVAL; sbi->interval_time[GC_TIME] =3D DEF_IDLE_INTERVAL; sbi->interval_time[DISABLE_TIME] =3D DEF_DISABLE_INTERVAL; - sbi->interval_time[ENABLE_TIME] =3D DEF_ENABLE_INTERVAL; sbi->interval_time[UMOUNT_DISCARD_TIMEOUT] =3D DEF_UMOUNT_DISCARD_TIMEOUT; clear_sbi_flag(sbi, SBI_NEED_FSCK); --=20 2.52.0.457.g6b5491de43-goog