From 354b1b716cde1eacf369fdffa43be14bc64a0e6c Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Mon, 13 Nov 2023 18:51:57 -0800 Subject: [PATCH] FROMGIT: f2fs: skip adding a discard command if exists When recovering zoned UFS, sometimes we add the same zone to discard multiple times. Simple workaround is to bypass adding it. Reviewed-by: Chao Yu Change-Id: Ic1501caa02aea8bdc9d7f00a8bd0d35be2ef4ba1 Signed-off-by: Jaegeuk Kim (cherry picked from commit bbd3efed3383e332191c665786c61653826d2ac3 https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev) --- fs/f2fs/segment.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index fa63bb6bd4e3..dd1ad74733fb 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1325,7 +1325,8 @@ static void __insert_discard_cmd(struct f2fs_sb_info *sbi, p = &(*p)->rb_right; leftmost = false; } else { - f2fs_bug_on(sbi, 1); + /* Let's skip to add, if exists */ + return; } }