diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
commit | 5af6a242945e39bf6ea39716d4eba316b735dce8 (patch) | |
tree | 35363a04680e1618f6ed1c2b4eafbbc3d59ef048 /fs/jbd2/transaction.c | |
parent | 7eff2ffe05a8b2c6c83a4f511ac6c31c858e3048 (diff) | |
parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'fs/jbd2/transaction.c')
-rw-r--r-- | fs/jbd2/transaction.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index ecc57071a1a9..a8c65539fbd2 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -2066,6 +2066,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh, if (!buffer_dirty(bh)) { /* bdflush has written it. We can drop it now */ + __jbd2_journal_remove_checkpoint(jh); goto zap_buffer; } @@ -2095,6 +2096,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh, /* The orphan record's transaction has * committed. We can cleanse this buffer */ clear_buffer_jbddirty(bh); + __jbd2_journal_remove_checkpoint(jh); goto zap_buffer; } } |