diff options
| author | Jan Kara <jack@suse.cz> | 2019-11-05 17:44:24 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-05 16:00:48 -0500 |
| commit | 9f356e5a4f12008fa0df8b6385fc0ab830416e72 (patch) | |
| tree | 6ec4a24cc440123cd810bf520c609d01abe0ebd3 /fs/jbd2/journal.c | |
| parent | ec8b6f600e49dc87a8564807fec4193bf93ee2b5 (diff) | |
| download | lwn-9f356e5a4f12008fa0df8b6385fc0ab830416e72.tar.gz lwn-9f356e5a4f12008fa0df8b6385fc0ab830416e72.zip | |
jbd2: Account descriptor blocks into t_outstanding_credits
Currently, journal descriptor blocks were not accounted in
transaction->t_outstanding_credits and we were just leaving some slack
space in the journal for them (in jbd2_log_space_left() and
jbd2_space_needed()). This is making proper accounting (and reservation
we want to add) of descriptor blocks difficult so switch to accounting
descriptor blocks in transaction->t_outstanding_credits and just reserve
the same amount of credits in t_outstanding credits for journal
descriptor blocks when creating transaction.
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20191105164437.32602-18-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2/journal.c')
| -rw-r--r-- | fs/jbd2/journal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index cc11097f1176..22b14b3ca197 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -840,6 +840,7 @@ jbd2_journal_get_descriptor_buffer(transaction_t *transaction, int type) bh = __getblk(journal->j_dev, blocknr, journal->j_blocksize); if (!bh) return NULL; + atomic_dec(&transaction->t_outstanding_credits); lock_buffer(bh); memset(bh->b_data, 0, journal->j_blocksize); header = (journal_header_t *)bh->b_data; |