[Devel] [PATCH RHEL7 COMMIT] backport jbd2: jbd2_cleanup_journal_tail fix gfp allocation context

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.15
------>
commit 6a1597d818818539c5be1d5197589721a27950c1
Author: Dmitry Monakhov <dmonakhov at openvz.org>
Date:   Mon Jun 22 14:39:21 2015 +0400

    backport jbd2: jbd2_cleanup_journal_tail fix gfp allocation context
    
    Original patch: http://marc.info/?l=linux-ext4&m=143395420821533&w=2
    
    Signed-off-by: Dmitry Monakhov <dmonakhov at openvz.org>
---
 fs/jbd2/checkpoint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 4d5950d..c6cc350 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -463,7 +463,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
 	 * jbd2_cleanup_journal_tail() doesn't get called all that often.
 	 */
 	if (journal->j_flags & JBD2_BARRIER)
-		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
+		blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL);
 
 	__jbd2_update_log_tail(journal, first_tid, blocknr);
 	return 0;