diff options
| author |   zhangyi (F) <yi.zhang@huawei.com> | 2020-02-13 14:38:20 +0800 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2020-02-13 12:06:17 -0500 |
| commit | 6a66a7ded12baa6ebbb2e3e82f8cb91382814839 (patch) | |
| tree | 55c1cdee9de02c6464af879e02ac3c1cf0783792 /fs/jbd2/transaction.c | |
| parent | ext4: add cond_resched() to ext4_protect_reserved_inode (diff) | |
| download | linux-dev-6a66a7ded12baa6ebbb2e3e82f8cb91382814839.tar.xz linux-dev-6a66a7ded12baa6ebbb2e3e82f8cb91382814839.zip | |
jbd2: move the clearing of b_modified flag to the journal_unmap_buffer()
There is no need to delay the clearing of b_modified flag to the
transaction committing time when unmapping the journalled buffer, so
just move it to the journal_unmap_buffer().
Link: https://lore.kernel.org/r/20200213063821.30455-2-yi.zhang@huawei.com
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Diffstat (limited to '')
| -rw-r--r-- | fs/jbd2/transaction.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index e77a5a0b4e46..2dd848a743ed 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -2329,14 +2329,16 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh, return -EBUSY; } /* - * OK, buffer won't be reachable after truncate. We just set - * j_next_transaction to the running transaction (if there is - * one) and mark buffer as freed so that commit code knows it - * should clear dirty bits when it is done with the buffer. + * OK, buffer won't be reachable after truncate. We just clear + * b_modified to not confuse transaction credit accounting, and + * set j_next_transaction to the running transaction (if there + * is one) and mark buffer as freed so that commit code knows + * it should clear dirty bits when it is done with the buffer. */ set_buffer_freed(bh); if (journal->j_running_transaction && buffer_jbddirty(bh)) jh->b_next_transaction = journal->j_running_transaction; + jh->b_modified = 0; spin_unlock(&journal->j_list_lock); spin_unlock(&jh->b_state_lock); write_unlock(&journal->j_state_lock); |