VisionFive2 Linux kernel

author: Dmitry Monakhov <dmonakhov@openvz.org> 2010-04-28 17:55:06 +0400 committer: Jens Axboe <jens.axboe@oracle.com> 2010-04-28 19:47:36 +0200 commit: fbd9b09a177a481eda256447c881f014f29034fe parent: 6b4517a7913a09d3259bb1d21c9cb300f12294bd

Commit Summary:

blkdev: generalize flags for blkdev_issue_fn functions

Diffstat:

1 file changed, 2 insertions, 1 deletion

diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 30beb11ef928..076d1cc44f95 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -530,7 +530,8 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
 	 */
 	if ((journal->j_fs_dev != journal->j_dev) &&
 	    (journal->j_flags & JBD2_BARRIER))
-		blkdev_issue_flush(journal->j_fs_dev, NULL);
+		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL,
+			BLKDEV_IFL_WAIT);
 	if (!(journal->j_flags & JBD2_ABORT))
 		jbd2_journal_update_superblock(journal, 1);
 	return 0;