lkml.org 
[lkml]   [2017]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 007/268] jbd2: don't leak modified metadata buffers on an aborted journal
    Date
    From: Theodore Ts'o <tytso@mit.edu>

    commit e112666b4959b25a8552d63bc564e1059be703e8 upstream.

    If the journal has been aborted, we shouldn't mark the underlying
    buffer head as dirty, since that will cause the metadata block to get
    modified. And if the journal has been aborted, we shouldn't allow
    this since it will almost certainly lead to a corrupted file system.

    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    fs/jbd2/transaction.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
    index 21b828c..54e9581 100644
    --- a/fs/jbd2/transaction.c
    +++ b/fs/jbd2/transaction.c
    @@ -1655,7 +1655,9 @@ static void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh)

    __blist_del_buffer(list, jh);
    jh->b_jlist = BJ_None;
    - if (test_clear_buffer_jbddirty(bh))
    + if (transaction && is_journal_aborted(transaction->t_journal))
    + clear_buffer_jbddirty(bh);
    + else if (test_clear_buffer_jbddirty(bh))
    mark_buffer_dirty(bh); /* Expose it to the VM */
    }

    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-06-19 21:06    [W:3.988 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site