diff options
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 1a51c8c53be..8b4c5c67dcd 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -212,10 +212,11 @@ static int ocfs2_sync_fs(struct super_block *sb, int wait) | |||
212 | ocfs2_schedule_truncate_log_flush(osb, 0); | 212 | ocfs2_schedule_truncate_log_flush(osb, 0); |
213 | } | 213 | } |
214 | 214 | ||
215 | if (journal_start_commit(OCFS2_SB(sb)->journal->j_journal, &target)) { | 215 | if (jbd2_journal_start_commit(OCFS2_SB(sb)->journal->j_journal, |
216 | &target)) { | ||
216 | if (wait) | 217 | if (wait) |
217 | log_wait_commit(OCFS2_SB(sb)->journal->j_journal, | 218 | jbd2_log_wait_commit(OCFS2_SB(sb)->journal->j_journal, |
218 | target); | 219 | target); |
219 | } | 220 | } |
220 | return 0; | 221 | return 0; |
221 | } | 222 | } |
@@ -332,6 +333,7 @@ static struct inode *ocfs2_alloc_inode(struct super_block *sb) | |||
332 | if (!oi) | 333 | if (!oi) |
333 | return NULL; | 334 | return NULL; |
334 | 335 | ||
336 | jbd2_journal_init_jbd_inode(&oi->ip_jinode, &oi->vfs_inode); | ||
335 | return &oi->vfs_inode; | 337 | return &oi->vfs_inode; |
336 | } | 338 | } |
337 | 339 | ||
@@ -896,7 +898,7 @@ static int ocfs2_parse_options(struct super_block *sb, | |||
896 | if (option < 0) | 898 | if (option < 0) |
897 | return 0; | 899 | return 0; |
898 | if (option == 0) | 900 | if (option == 0) |
899 | option = JBD_DEFAULT_MAX_COMMIT_AGE; | 901 | option = JBD2_DEFAULT_MAX_COMMIT_AGE; |
900 | mopt->commit_interval = HZ * option; | 902 | mopt->commit_interval = HZ * option; |
901 | break; | 903 | break; |
902 | case Opt_localalloc: | 904 | case Opt_localalloc: |