diff options
| author |   Harshad Shirwadkar <harshadshirwadkar@gmail.com> | 2020-11-05 19:59:01 -0800 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2020-11-06 23:01:04 -0500 |
| commit | 480f89d553260e7823920e687846877bebc8dca0 (patch) | |
| tree | 21e61078d9f9a999c939f1d009478e51e6531490 /fs/jbd2 | |
| parent | jbd2: don't touch buffer state until it is filled (diff) | |
| download | linux-dev-480f89d553260e7823920e687846877bebc8dca0.tar.xz linux-dev-480f89d553260e7823920e687846877bebc8dca0.zip | |
jbd2: don't read journal->j_commit_sequence without taking a lock
Take journal state lock before reading journal->j_commit_sequence.
Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
Link: https://lore.kernel.org/r/20201106035911.1942128-13-harshadshirwadkar@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index b5fbcd1b444c..f7ebf6ef69af 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -734,10 +734,12 @@ int jbd2_fc_begin_commit(journal_t *journal, tid_t tid) if (!journal->j_stats.ts_tid) return -EINVAL; - if (tid <= journal->j_commit_sequence) + write_lock(&journal->j_state_lock); + if (tid <= journal->j_commit_sequence) { + write_unlock(&journal->j_state_lock); return -EALREADY; + } - write_lock(&journal->j_state_lock); if (journal->j_flags & JBD2_FULL_COMMIT_ONGOING || (journal->j_flags & JBD2_FAST_COMMIT_ONGOING)) { DEFINE_WAIT(wait); |