summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorTahsin Erdogan <tahsin@google.com>2017-05-21 22:32:23 -0400
committerTheodore Ts'o <tytso@mit.edu>2017-05-21 22:32:23 -0400
commitb4709067ac0944e4a5b94eabdc26155c6f2efbd7 (patch)
treede9a366b1bdd21eaf01db395ded3681e0c7a79b0 /fs/jbd2
parent964edf66bf9ab70cb387b27946c0aef7b94c4d1b (diff)
downloadlinux-stable-b4709067ac0944e4a5b94eabdc26155c6f2efbd7.tar.gz
linux-stable-b4709067ac0944e4a5b94eabdc26155c6f2efbd7.tar.bz2
linux-stable-b4709067ac0944e4a5b94eabdc26155c6f2efbd7.zip
jbd2: preserve original nofs flag during journal restart
When a transaction starts, start_this_handle() saves current PF_MEMALLOC_NOFS value so that it can be restored at journal stop time. Journal restart is a special case that calls start_this_handle() without stopping the transaction. start_this_handle() isn't aware that the original value is already stored so it overwrites it with current value. For instance, a call sequence like below leaves PF_MEMALLOC_NOFS flag set at the end: jbd2_journal_start() jbd2__journal_restart() jbd2_journal_stop() Make jbd2__journal_restart() restore the original value before calling start_this_handle(). Fixes: 81378da64de6 ("jbd2: mark the transaction context with the scope GFP_NOFS context") Signed-off-by: Tahsin Erdogan <tahsin@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/transaction.c6
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;
}