From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Tue, 14 Nov 2023 02:51:57 +0000 (-0800)
Subject: f2fs: skip adding a discard command if exists
X-Git-Tag: microblaze-v6.10~606^2~26
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=bbd3efed3383e332191c665786c61653826d2ac3;p=linux-2.6-microblaze.git

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 <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 727d016318f9..f4ffd64b44b2 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1380,7 +1380,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;
 		}
 	}