Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Jaegeuk Kim <> | Subject | [PATCH 1/2] f2fs: avoid deadlock caused by lock order of page and lock_op | Date | Sat, 24 Jun 2017 09:25:21 -0700 |
| |
- punch_hole - fill_zero - f2fs_lock_op - get_new_data_page - lock_page
- f2fs_write_data_pages - lock_page - do_write_data_page - f2fs_lock_op
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 7d3af48d34a9..9141bd19a902 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1404,8 +1404,9 @@ int do_write_data_page(struct f2fs_io_info *fio) } } - if (fio->need_lock == LOCK_REQ) - f2fs_lock_op(fio->sbi); + /* Deadlock due to between page->lock and f2fs_lock_op */ + if (fio->need_lock == LOCK_REQ && !f2fs_trylock_op(fio->sbi)) + return -EAGAIN; err = get_dnode_of_data(&dn, page->index, LOOKUP_NODE); if (err) -- 2.13.0.rc1.294.g07d810a77f-goog
| ![\](/images/icornerr.gif) |