diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 10:22:51 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 10:22:51 +0300 |
| commit | 9fe64e15148d1ff81fa0bcb5fd58531e3ae2aa3a (patch) | |
| tree | 602da9e86cd3dfc4fae846dceb6fba87aa7ca30b /fs/jbd2/commit.c | |
| parent | fd5d666932d51b2552ecc0280047d6b35d9b6cd1 (diff) | |
| parent | c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff) | |
| download | linux-9fe64e15148d1ff81fa0bcb5fd58531e3ae2aa3a.tar.xz | |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 8c514367ba5a..b6b194ec1b4f 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -393,7 +393,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) /* Do we need to erase the effects of a prior jbd2_journal_flush? */ if (journal->j_flags & JBD2_FLUSHED) { jbd_debug(3, "super block updated\n"); - mutex_lock(&journal->j_checkpoint_mutex); + mutex_lock_io(&journal->j_checkpoint_mutex); /* * We hold j_checkpoint_mutex so tail cannot change under us. * We don't need any special data guarantees for writing sb |