From 5a54c65c3509e5494e4ea047df37eb07a5c302e0 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Fri, 12 Jul 2019 15:52:45 -0700 Subject: [PATCH] ANDROID: f2fs: fix wrong android tracepoint f2fs_submit_page_bio is called from in-place-write case. Let's not assume read path only. Fixes: 8a007427f605 ("ANDROID: f2fs: Complement "android_fs" tracepoint of read path") Change-Id: I9bb8b7833d57c4342b318da52e4353f70acc3eb0 Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index a511a38d49a0..c69bd2553bb1 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -513,7 +513,10 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) inc_page_count(fio->sbi, is_read_io(fio->op) ? __read_io_type(page): WB_DATA_TYPE(fio->page)); - __f2fs_submit_read_bio(fio->sbi, bio, fio->type); + if (is_read_io(fio->op)) + __f2fs_submit_read_bio(fio->sbi, bio, fio->type); + else + __submit_bio(fio->sbi, bio, fio->type); return 0; }