diff options
| author | Jan Kara <jack@suse.cz> | 2016-06-30 11:39:38 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-06-30 11:39:38 -0400 |
| commit | ab714aff4f744f52f0beae93ed441f2f5585eb7a (patch) | |
| tree | 2c62c6356d6445d05492d3838e2acfc27db4192c /fs/jbd2/journal.c | |
| parent | 7a4b188f0c0b49ed8ae41489494a9669ad7f1f8c (diff) | |
| download | op-kernel-dev-ab714aff4f744f52f0beae93ed441f2f5585eb7a.zip op-kernel-dev-ab714aff4f744f52f0beae93ed441f2f5585eb7a.tar.gz | |
jbd2: move lockdep tracking to journal_s
Currently lockdep map is tracked in each journal handle. To be able to
expand lockdep support to cover also other cases where we depend on
transaction commit and where handle is not available, move lockdep map
into struct journal_s. Since this makes the lockdep map shared for all
handles, we have to use rwsem_acquire_read() for acquisitions now.
Signed-off-by: Jan Kara <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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index b31852f..208e405 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1091,6 +1091,7 @@ static void jbd2_stats_proc_exit(journal_t *journal) static journal_t * journal_init_common (void) { + static struct lock_class_key jbd2_trans_commit_key; journal_t *journal; int err; @@ -1126,6 +1127,9 @@ static journal_t * journal_init_common (void) spin_lock_init(&journal->j_history_lock); + lockdep_init_map(&journal->j_trans_commit_map, "jbd2_handle", + &jbd2_trans_commit_key, 0); + return journal; } |
