]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
f2fs: fix to account IO correctly
authorChao Yu <yuchao0@huawei.com>
Mon, 22 Oct 2018 01:12:51 +0000 (09:12 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 23 Oct 2018 00:53:48 +0000 (17:53 -0700)
Below race can cause reversed reference on dirty count, fix it by
relocating __submit_bio() and inc_page_count().

Thread A Thread B
- f2fs_inplace_write_data
 - f2fs_submit_page_bio
  - __submit_bio
- f2fs_write_end_io
 - dec_page_count
  - inc_page_count

Cc: <stable@vger.kernel.org>
Fixes: d1b3e72d5490 ("f2fs: submit bio of in-place-update pages")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/data.c

index 9ef6f1f01eda821a1632b03a5e995d571ccc2797..83b1983094bd9e9f7221f5fac96d56d25ca7663b 100644 (file)
@@ -462,10 +462,10 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
        }
        bio_set_op_attrs(bio, fio->op, fio->op_flags);
 
-       __submit_bio(fio->sbi, bio, fio->type);
-
        if (!is_read_io(fio->op))
                inc_page_count(fio->sbi, WB_DATA_TYPE(fio->page));
+
+       __submit_bio(fio->sbi, bio, fio->type);
        return 0;
 }