diff options
| author | Chao Yu <yuchao0@huawei.com> | 2020-02-24 19:20:16 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-02-27 10:16:45 -0800 |
| commit | df77fbd8c5b222c680444801ffd20e8bbc90a56e (patch) | |
| tree | 33d1065469f964b0a4c25b2fe2745981ad098d6a /fs | |
| parent | 097a7686503f3a7d5c3cce66a69b1e51f51d5a4f (diff) | |
| download | linux-df77fbd8c5b222c680444801ffd20e8bbc90a56e.tar.bz2 | |
f2fs: fix to avoid potential deadlock
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/compress.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 5ca2ea0e1e45..6da33ba2b2db 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -775,7 +775,6 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, .encrypted_page = NULL, .compressed_page = NULL, .submitted = false, - .need_lock = LOCK_RETRY, .io_type = io_type, .io_wbc = wbc, .encrypted = f2fs_encrypted_file(cc->inode), @@ -788,9 +787,10 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, loff_t psize; int i, err; - set_new_dnode(&dn, cc->inode, NULL, NULL, 0); + if (!f2fs_trylock_op(sbi)) + return -EAGAIN; - f2fs_lock_op(sbi); + set_new_dnode(&dn, cc->inode, NULL, NULL, 0); err = f2fs_get_dnode_of_data(&dn, start_idx, LOOKUP_NODE); if (err) |