From mboxrd@z Thu Jan 1 00:00:00 1970 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 4606123B615 for ; Tue, 20 Jan 2026 12:40:39 +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=1768912840; cv=none; b=VoBl++RSWmI4PxmptP/gn44eXgEtFRJHWt9jPub7biod5vuXGc5NQHzbr6b3EjESH3TYQ0Rv6p2CygBnf1OK2q+FMzBPlxySt9HGhap/+hoqAPkD9ItbiwCCuXp6I+cVSdVyHE8DjHhV9fqhZOw0rjHVOcYo6cATCbe8XXLQb9E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768912840; c=relaxed/simple; bh=qd4e/5NjQ+ychHUY5U3BEFVht7+iweMgKxWb82Ab90o=; h=Message-ID:Date:MIME-Version:Cc:Subject:To:References:From: In-Reply-To:Content-Type; b=Ytsz6zCSJ77iAiH7Fa3TG80p/dT9Mx/7vEESKWWn7omKarru8f+zmmg8SjKa0toJOiDyA79RWPe/oKUp+D0gUpwMwkVHkVKdl207dzhW54zQOM9OXDeogElcQsRm8+lJJchfNbc4EARupPnkDLx6r7gsBcrBn72F4jZhWJZBE4A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BWWX9TC3; 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="BWWX9TC3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 763F0C16AAE; Tue, 20 Jan 2026 12:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768912839; bh=qd4e/5NjQ+ychHUY5U3BEFVht7+iweMgKxWb82Ab90o=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=BWWX9TC3pfc/3BHW/pCYKjJiGUUEKMAyIUiQsN4GxU+CjINBBKU6WSRApd0vUlY2k dhVNRo9zEgmUg6YYZyUmN4S4/QovhYSyDUy6lY3f5JbsM7MfU1LSSzJUMxtrUIEkxh TmuMT9Jzs7ksLt4I0mfr8vHIS3ZDphb7b3lnXQ5BKBJxkDlLWhWdUW+Hu/drXWMatu Omk+sUmKCGhm6GrH5FKH094b5kG2QXS9pd4Z/8kIz6HDJQOMkZLpH8+AIlSlxkBQo4 J8L0ZKQ6njwk8j6B5Q4M5WFSqAXvc5oLVyoLOCfFd0Tzg/HJX6T+PLdTSlo9KlSDW1 +drsYcOyzYYiA== Message-ID: Date: Tue, 20 Jan 2026 20:40:38 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: chao@kernel.org, stable@kernel.org Subject: Re: [f2fs-dev] [PATCH] Revert "f2fs: add timeout in f2fs_enable_checkpoint()" To: Jaegeuk Kim , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net References: <20260116215044.2565391-1-jaegeuk@kernel.org> Content-Language: en-US From: Chao Yu In-Reply-To: <20260116215044.2565391-1-jaegeuk@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/17/2026 5:50 AM, Jaegeuk Kim via Linux-f2fs-devel wrote: > 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()") We don't need to add Cc stable and Fixes line due to there is no regression issue, meanwhile it needs to change commit message a bit. Otherwise, it looks good to me. Reviewed-by: Chao Yu Thanks, > Signed-off-by: Jaegeuk Kim > --- > 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 */ > > @@ -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_info *sbi) > > static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi) > { > - unsigned int nr_pages = get_pages(sbi, F2FS_DIRTY_DATA) / 16; > + int retry = 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_info *sbi) > get_pages(sbi, F2FS_DIRTY_NODES), > get_pages(sbi, F2FS_DIRTY_DATA)); > > - f2fs_update_time(sbi, ENABLE_TIME); > - > start = ktime_get(); > > /* 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--); > > - if (f2fs_time_over(sbi, ENABLE_TIME)) > - break; > - } > writeback = ktime_get(); > > - sync_inodes_sb(sbi->sb); > - > if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA))) > f2fs_warn(sbi, "checkpoint=enable 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] = DEF_IDLE_INTERVAL; > sbi->interval_time[GC_TIME] = DEF_IDLE_INTERVAL; > sbi->interval_time[DISABLE_TIME] = DEF_DISABLE_INTERVAL; > - sbi->interval_time[ENABLE_TIME] = DEF_ENABLE_INTERVAL; > sbi->interval_time[UMOUNT_DISCARD_TIMEOUT] = > DEF_UMOUNT_DISCARD_TIMEOUT; > clear_sbi_flag(sbi, SBI_NEED_FSCK);