From f236331eca99eb2f3f0657cf16ed6a11ecc13aca Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Sun, 25 Oct 2015 14:30:48 +0100 Subject: merged fs --- fs/jbd2/checkpoint.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fs/jbd2') diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 3a98cb0..2c62c5a 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -543,7 +543,8 @@ int jbd2_cleanup_journal_tail(journal_t *journal) * correctness. Fortunately jbd2_cleanup_journal_tail() * doesn't get called all that often. */ - if (journal->j_flags & JBD2_BARRIER) + if ((journal->j_fs_dev != journal->j_dev) && + (journal->j_flags & JBD2_BARRIER)) blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL); if (!(journal->j_flags & JBD2_ABORT)) jbd2_journal_update_superblock(journal, 1); -- cgit v1.1