Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbe371d3 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix to drop all inmem pages correctly 



In commit 57864ae5ce3a ("f2fs: limit # of inmemory pages"), we have
limited memory footprint of all inmem pages with 20% of total memory,
otherwise, if we exceed the threshold, we will try to drop all inmem
pages to avoid excessive memory pressure resulting in performance
regression.

But in some unrelated error paths, we will also drop all inmem pages,
which should be wrong, fix it in this patch.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 7e08ce43

fs/f2fs/data.c

+3 −2
Original line number Diff line number Diff line
@@ -2083,7 +2083,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct page *page = NULL;

	pgoff_t index = ((unsigned long long) pos) >> PAGE_SHIFT;

	bool need_balance = false;

	bool need_balance = false, drop_atomic = false;

	block_t blkaddr = NULL_ADDR;

	int err = 0;
@@ -2092,6 +2092,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
	if (f2fs_is_atomic_file(inode) &&

			!available_free_memory(sbi, INMEM_PAGES)) {

		err = -ENOMEM;

		drop_atomic = true;

		goto fail;

	}
@@ -2172,7 +2173,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
fail:

	f2fs_put_page(page, 1);

	f2fs_write_failed(mapping, pos + len);

	if (f2fs_is_atomic_file(inode))

	if (drop_atomic)

		drop_inmem_pages_all(sbi);

	return err;

}