From: Greg Kroah-Hartman Date: Sat, 16 Sep 2017 01:28:52 +0000 (-0700) Subject: 4.4-stable patches X-Git-Tag: v4.9.51~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34ae6e54f9d2e5c55018aca19b107462df927d0c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: f2fs-check-hot_data-for-roll-forward-recovery.patch --- diff --git a/queue-4.4/f2fs-check-hot_data-for-roll-forward-recovery.patch b/queue-4.4/f2fs-check-hot_data-for-roll-forward-recovery.patch new file mode 100644 index 00000000000..d12dbfed51e --- /dev/null +++ b/queue-4.4/f2fs-check-hot_data-for-roll-forward-recovery.patch @@ -0,0 +1,31 @@ +From 125c9fb1ccb53eb2ea9380df40f3c743f3fb2fed Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Sat, 12 Aug 2017 21:33:23 -0700 +Subject: f2fs: check hot_data for roll-forward recovery + +From: Jaegeuk Kim + +commit 125c9fb1ccb53eb2ea9380df40f3c743f3fb2fed upstream. + +We need to check HOT_DATA to truncate any previous data block when doing +roll-forward recovery. + +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Greg Kroah-Hartman + +--- + fs/f2fs/recovery.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/f2fs/recovery.c ++++ b/fs/f2fs/recovery.c +@@ -276,7 +276,7 @@ static int check_index_in_prev_nodes(str + return 0; + + /* Get the previous summary */ +- for (i = CURSEG_WARM_DATA; i <= CURSEG_COLD_DATA; i++) { ++ for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) { + struct curseg_info *curseg = CURSEG_I(sbi, i); + if (curseg->segno == segno) { + sum = curseg->sum_blk->entries[blkoff]; diff --git a/queue-4.4/series b/queue-4.4/series index a61e9349b6f..3af64de93f2 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -9,3 +9,4 @@ revert-net-fix-percpu-memory-leaks.patch gianfar-fix-tx-flow-control-deactivation.patch ipv6-fix-memory-leak-with-multiple-tables-during-netns-destruction.patch ipv6-fix-typo-in-fib6_net_exit.patch +f2fs-check-hot_data-for-roll-forward-recovery.patch