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

Commit 0478ccdc authored Jan 27, 2022 by Chao Yu Committed by Greg Kroah-Hartman Apr 15, 2022

f2fs: fix to avoid potential deadlock



[ Upstream commit df77fbd8c5b222c680444801ffd20e8bbc90a56e ]

Using f2fs_trylock_op() in f2fs_write_compressed_pages() to avoid potential
deadlock like we did in f2fs_write_single_data_page().

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 005f9cda

fs/f2fs/data.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -2467,8 +2467,12 @@ static int __f2fs_write_data_pages(struct address_space *mapping,
		/* to avoid spliting IOs due to mixed WB_SYNC_ALL and WB_SYNC_NONE */
		if (wbc->sync_mode == WB_SYNC_ALL)
		atomic_inc(&sbi->wb_sync_req[DATA]);
		else if (atomic_read(&sbi->wb_sync_req[DATA]))
		else if (atomic_read(&sbi->wb_sync_req[DATA])) {
		/* to avoid potential deadlock */
		if (current->plug)
		blk_finish_plug(current->plug);
		goto skip_write;
		}

		if (__should_serialize_io(inode, wbc)) {
		mutex_lock(&sbi->writepages);

fs/f2fs/node.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1995,8 +1995,12 @@ static int f2fs_write_node_pages(struct address_space *mapping,

		if (wbc->sync_mode == WB_SYNC_ALL)
		atomic_inc(&sbi->wb_sync_req[NODE]);
		else if (atomic_read(&sbi->wb_sync_req[NODE]))
		else if (atomic_read(&sbi->wb_sync_req[NODE])) {
		/* to avoid potential deadlock */
		if (current->plug)
		blk_finish_plug(current->plug);
		goto skip_write;
		}

		trace_f2fs_writepages(mapping->host, wbc, NODE);