diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 14:30:48 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 14:30:48 +0100 |
| commit | f236331eca99eb2f3f0657cf16ed6a11ecc13aca (patch) | |
| tree | f0aee9436b6fdf50f14c4f15e41b8c7616663558 /fs/jbd2 | |
| parent | 81cf65ff6fa1af7199001a61ce126e57b64ce98a (diff) | |
| download | kernel_samsung_smdk4412-f236331eca99eb2f3f0657cf16ed6a11ecc13aca.zip kernel_samsung_smdk4412-f236331eca99eb2f3f0657cf16ed6a11ecc13aca.tar.gz kernel_samsung_smdk4412-f236331eca99eb2f3f0657cf16ed6a11ecc13aca.tar.bz2 | |
merged fs
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/checkpoint.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |