super.c (12462f1d9f0b96389497438dc2730c6f7410be82) super.c (2b4e30fbde425828b17f0e9c8f8e3fd3ecb2bc75)
1/* -*- mode: c; c-basic-offset: 8; -*-
2 * vim: noexpandtab sw=8 ts=8 sts=0:
3 *
4 * super.c
5 *
6 * load/unload driver, mount/dismount volumes
7 *
8 * Copyright (C) 2002, 2004 Oracle. All rights reserved.

--- 198 unchanged lines hidden (view full) ---

207 if (wait) {
208 status = ocfs2_flush_truncate_log(osb);
209 if (status < 0)
210 mlog_errno(status);
211 } else {
212 ocfs2_schedule_truncate_log_flush(osb, 0);
213 }
214
1/* -*- mode: c; c-basic-offset: 8; -*-
2 * vim: noexpandtab sw=8 ts=8 sts=0:
3 *
4 * super.c
5 *
6 * load/unload driver, mount/dismount volumes
7 *
8 * Copyright (C) 2002, 2004 Oracle. All rights reserved.

--- 198 unchanged lines hidden (view full) ---

207 if (wait) {
208 status = ocfs2_flush_truncate_log(osb);
209 if (status < 0)
210 mlog_errno(status);
211 } else {
212 ocfs2_schedule_truncate_log_flush(osb, 0);
213 }
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 target);
218 jbd2_log_wait_commit(OCFS2_SB(sb)->journal->j_journal,
219 target);
219 }
220 return 0;
221}
222
223static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb)
224{
225 struct inode *new = NULL;
226 int status = 0;

--- 100 unchanged lines hidden (view full) ---

327static struct inode *ocfs2_alloc_inode(struct super_block *sb)
328{
329 struct ocfs2_inode_info *oi;
330
331 oi = kmem_cache_alloc(ocfs2_inode_cachep, GFP_NOFS);
332 if (!oi)
333 return NULL;
334
220 }
221 return 0;
222}
223
224static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb)
225{
226 struct inode *new = NULL;
227 int status = 0;

--- 100 unchanged lines hidden (view full) ---

328static struct inode *ocfs2_alloc_inode(struct super_block *sb)
329{
330 struct ocfs2_inode_info *oi;
331
332 oi = kmem_cache_alloc(ocfs2_inode_cachep, GFP_NOFS);
333 if (!oi)
334 return NULL;
335
336 jbd2_journal_init_jbd_inode(&oi->ip_jinode, &oi->vfs_inode);
335 return &oi->vfs_inode;
336}
337
338static void ocfs2_destroy_inode(struct inode *inode)
339{
340 kmem_cache_free(ocfs2_inode_cachep, OCFS2_I(inode));
341}
342

--- 548 unchanged lines hidden (view full) ---

891 option = 0;
892 if (match_int(&args[0], &option)) {
893 status = 0;
894 goto bail;
895 }
896 if (option < 0)
897 return 0;
898 if (option == 0)
337 return &oi->vfs_inode;
338}
339
340static void ocfs2_destroy_inode(struct inode *inode)
341{
342 kmem_cache_free(ocfs2_inode_cachep, OCFS2_I(inode));
343}
344

--- 548 unchanged lines hidden (view full) ---

893 option = 0;
894 if (match_int(&args[0], &option)) {
895 status = 0;
896 goto bail;
897 }
898 if (option < 0)
899 return 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;
901 break;
902 case Opt_localalloc:
903 option = 0;
904 if (match_int(&args[0], &option)) {
905 status = 0;
906 goto bail;
907 }

--- 1003 unchanged lines hidden --- 		902 mopt->commit_interval = HZ * option;
903 break;
904 case Opt_localalloc:
905 option = 0;
906 if (match_int(&args[0], &option)) {
907 status = 0;
908 goto bail;
909 }

--- 1003 unchanged lines hidden ---