lkml.org 
[lkml]   [2020]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 047/166] f2fs: fix to avoid potential deadlock
    Date
    From: Chao Yu <yuchao0@huawei.com>

    [ 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>
    ---
    fs/f2fs/compress.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
    index d8a64be90a501..c847523ab4a2e 100644
    --- a/fs/f2fs/compress.c
    +++ b/fs/f2fs/compress.c
    @@ -772,7 +772,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),
    @@ -785,9 +784,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)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-04-22 12:37    [W:4.120 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site