lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 15/71] jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock()
    Date
    From: zhangyi (F) <yi.zhang@huawei.com>

    commit ef3f5830b859604eda8723c26d90ab23edc027a4 upstream.

    jbd2_write_superblock() is under the buffer lock of journal superblock
    before ending that superblock write, so add a missing unlock_buffer() in
    in the error path before submitting buffer.

    Fixes: 742b06b5628f ("jbd2: check superblock mapped prior to committing")
    Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
    Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
    Cc: stable@kernel.org
    Link: https://lore.kernel.org/r/20200620061948.2049579-1-yi.zhang@huawei.com
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/jbd2/journal.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/fs/jbd2/journal.c
    +++ b/fs/jbd2/journal.c
    @@ -1370,8 +1370,10 @@ static int jbd2_write_superblock(journal
    int ret;

    /* Buffer got discarded which means block device got invalidated */
    - if (!buffer_mapped(bh))
    + if (!buffer_mapped(bh)) {
    + unlock_buffer(bh);
    return -EIO;
    + }

    trace_jbd2_write_superblock(journal, write_flags);
    if (!(journal->j_flags & JBD2_BARRIER))

    \
     
     \ /
      Last update: 2020-08-24 10:56    [W:4.564 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site