Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

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

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 188f79d..2dc9444 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1869,9 +1869,7 @@ static int load_superblock(journal_t *journal)
 
        if (jbd2_has_feature_fast_commit(journal)) {
                journal->j_fc_last = be32_to_cpu(sb->s_maxlen);
-               num_fc_blocks = be32_to_cpu(sb->s_num_fc_blks);
-               if (!num_fc_blocks)
-                       num_fc_blocks = JBD2_MIN_FC_BLOCKS;
+               num_fc_blocks = jbd2_journal_get_num_fc_blks(sb);
                if (journal->j_last - num_fc_blocks >= JBD2_MIN_JOURNAL_BLOCKS)
                        journal->j_last = journal->j_fc_last - num_fc_blocks;
                journal->j_fc_first = journal->j_last + 1;
@@ -2102,9 +2100,7 @@ jbd2_journal_initialize_fast_commit(journal_t *journal)
        journal_superblock_t *sb = journal->j_superblock;
        unsigned long long num_fc_blks;
 
-       num_fc_blks = be32_to_cpu(sb->s_num_fc_blks);
-       if (num_fc_blks == 0)
-               num_fc_blks = JBD2_MIN_FC_BLOCKS;
+       num_fc_blks = jbd2_journal_get_num_fc_blks(sb);
        if (journal->j_last - num_fc_blks < JBD2_MIN_JOURNAL_BLOCKS)
                return -ENOSPC;