diff options
author | Thomas Gleixner | 2017-06-21 09:07:52 +0200 |
---|---|---|
committer | Thomas Gleixner | 2017-06-21 09:07:52 +0200 |
commit | f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch) | |
tree | 84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /fs/jbd2 | |
parent | posix-cpu-timers: Make timespec to nsec conversion safe (diff) | |
parent | Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel... (diff) | |
download | kernel-qcow2-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.gz kernel-qcow2-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.xz kernel-qcow2-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.zip |
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to 'fs/jbd2')
-rw-r--r-- | fs/jbd2/transaction.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 9ee4832b6f8b..2d30a6da7013 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -680,6 +680,12 @@ int jbd2__journal_restart(handle_t *handle, int nblocks, gfp_t gfp_mask) rwsem_release(&journal->j_trans_commit_map, 1, _THIS_IP_); handle->h_buffer_credits = nblocks; + /* + * Restore the original nofs context because the journal restart + * is basically the same thing as journal stop and start. + * start_this_handle will start a new nofs context. + */ + memalloc_nofs_restore(handle->saved_alloc_context); ret = start_this_handle(journal, handle, gfp_mask); return ret; } |