f2fs: fix to update upper_p in __get_secs_required() correctly

[ Upstream commit 6840faddb65683b4e7bd8196f177b038a1e19faf ]

Commit 1acd73edbbfe ("f2fs: fix to account dirty data in __get_secs_required()")
missed to calculate upper_p w/ data_secs, fix it.

Fixes: 1acd73edbbfe ("f2fs: fix to account dirty data in __get_secs_required()")
Cc: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index db619fd2f51a5205a518e77ceb7ba654052e151d..f11822ec3fece1917102fe49914d1a9a310aa0fe 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -684,7 +684,7 @@ static inline void __get_secs_required(struct f2fs_sb_info *sbi,
        if (lower_p)
                *lower_p = node_secs + dent_secs + data_secs;
        if (upper_p)
-               *upper_p = node_secs + dent_secs +
+               *upper_p = node_secs + dent_secs + data_secs +
                        (node_blocks ? 1 : 0) + (dent_blocks ? 1 : 0) +
                        (data_blocks ? 1 : 0);
        if (curseg_p)