summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-13 14:42:12 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-13 14:42:12 -0400
commit7ee4f2193d12d1d6ab3f28f4867f838781f279c9 (patch)
treefb3ac638727c25a3c54b8a93bf88ec98897dba76
parent6363a0acdd757a51c9a6f6b70d634b85b737202b (diff)
downloadlongterm-queue-4.18-7ee4f2193d12d1d6ab3f28f4867f838781f279c9.tar.gz
f2fs: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch b/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch
index 57ac148..3e76b41 100644
--- a/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch
+++ b/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch
@@ -1,4 +1,4 @@
-From 22d61e286e2d9097dae36f75ed48801056b77cac Mon Sep 17 00:00:00 2001
+From a815c20f7831577ecc11e48537136985fca11c87 Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Mon, 15 Apr 2019 15:28:37 +0800
Subject: [PATCH] f2fs: fix to avoid panic in do_recover_data()
@@ -49,12 +49,12 @@ Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
-index d4f9d5408103..b14c718139a9 100644
+index 35140029f67f..9ea8b337759e 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
-@@ -551,7 +551,15 @@ retry_dn:
- goto err;
+@@ -478,7 +478,15 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
+ f2fs_get_node_info(sbi, dn.nid, &ni);
f2fs_bug_on(sbi, ni.ino != ino_of_node(page));
- f2fs_bug_on(sbi, ofs_of_node(dn.node_page) != ofs_of_node(page));
+