ext4: add discard/zeroout flags to journal flush

[linux-2.6-microblaze.git] / fs / ocfs2 / journal.c

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 4e589ce..4f15750 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -308,7 +308,7 @@ static int ocfs2_commit_cache(struct ocfs2_super *osb)
        }
 
        jbd2_journal_lock_updates(journal->j_journal);
-       status = jbd2_journal_flush(journal->j_journal);
+       status = jbd2_journal_flush(journal->j_journal, 0);
        jbd2_journal_unlock_updates(journal->j_journal);
        if (status < 0) {
                up_write(&journal->j_trans_barrier);
@@ -1000,7 +1000,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
 
        if (ocfs2_mount_local(osb)) {
                jbd2_journal_lock_updates(journal->j_journal);
-               status = jbd2_journal_flush(journal->j_journal);
+               status = jbd2_journal_flush(journal->j_journal, 0);
                jbd2_journal_unlock_updates(journal->j_journal);
                if (status < 0)
                        mlog_errno(status);
@@ -1070,7 +1070,7 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local, int replayed)
 
        if (replayed) {
                jbd2_journal_lock_updates(journal->j_journal);
-               status = jbd2_journal_flush(journal->j_journal);
+               status = jbd2_journal_flush(journal->j_journal, 0);
                jbd2_journal_unlock_updates(journal->j_journal);
                if (status < 0)
                        mlog_errno(status);
@@ -1666,7 +1666,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
 
        /* wipe the journal */
        jbd2_journal_lock_updates(journal);
-       status = jbd2_journal_flush(journal);
+       status = jbd2_journal_flush(journal, 0);
        jbd2_journal_unlock_updates(journal);
        if (status < 0)
                mlog_errno(status);