Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocfs2: pass ocfs2_super * into ocfs2_commit_trans()

Browse source 
This sets us up to remove handle->journal.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
This commit is contained in:
Mark Fasheh 2006-10-09 16:48:10 -07:00
parent 4bcec1847a
commit 02dc1af44e
11 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/ocfs2/alloc.c
View file

@ -1170,7 +1170,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
if (status < 0)
mlog_errno(status);
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
out_unlock:
brelse(data_alloc_bh);
@ -1379,7 +1379,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
status = ocfs2_truncate_log_append(osb, handle,
start_blk, clusters);
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
if (status < 0) {
mlog_errno(status);
goto bail_up;
@ -1883,7 +1883,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
mutex_unlock(&tl_inode->i_mutex);
tl_sem = 0;
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
handle = NULL;
BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters);
@ -1898,7 +1898,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
mutex_unlock(&tl_inode->i_mutex);
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
if (last_eb_bh)
brelse(last_eb_bh);

4
fs/ocfs2/aops.c
View file

@ -382,7 +382,7 @@ struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
out:
if (ret) {
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
handle = ERR_PTR(ret);
}
return handle;
@ -464,7 +464,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page,
}
out_commit:
ocfs2_commit_trans(handle);
ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
out_unlock_data:
ocfs2_data_unlock(inode, 1);
out_unlock_meta:

2
fs/ocfs2/dir.c
View file

@ -488,7 +488,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
get_bh(*new_de_bh);
bail:
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
if (data_ac)
ocfs2_free_alloc_context(data_ac);

12
fs/ocfs2/file.c
View file

@ -178,7 +178,7 @@ static int ocfs2_simple_size_update(struct inode *inode,
if (ret < 0)
mlog_errno(ret);
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
out:
return ret;
}
@ -207,7 +207,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
if (status < 0)
mlog_errno(status);
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
out:
mlog_exit(status);
return status;
@ -576,7 +576,7 @@ static int ocfs2_extend_allocation(struct inode *inode,
drop_alloc_sem = 0;
}
if (handle) {
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
handle = NULL;
}
if (data_ac) {
@ -655,7 +655,7 @@ static int ocfs2_write_zero_page(struct inode *inode,
ret = 0;
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
out_unlock:
unlock_page(page);
page_cache_release(page);
@ -850,7 +850,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
mlog_errno(status);
bail_commit:
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
bail_unlock:
ocfs2_meta_unlock(inode, 1);
bail_unlock_rw:
@ -938,7 +938,7 @@ static int ocfs2_write_remove_suid(struct inode *inode)
out_bh:
brelse(bh);
out_trans:
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
out:
mlog_exit(ret);
return ret;

6
fs/ocfs2/inode.c
View file

@ -538,7 +538,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
goto bail;
}
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
handle = NULL;
status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc);
@ -554,7 +554,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
}
bail:
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
mlog_exit(status);
return status;
@ -629,7 +629,7 @@ static int ocfs2_remove_inode(struct inode *inode,
mlog_errno(status);
bail_commit:
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
bail_unlock:
ocfs2_meta_unlock(inode_alloc_inode, 1);
mutex_unlock(&inode_alloc_inode->i_mutex);

2
fs/ocfs2/ioctl.c
View file

@ -96,7 +96,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
if (status < 0)
mlog_errno(status);
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
bail_unlock:
ocfs2_meta_unlock(inode, 1);
bail:

5
fs/ocfs2/journal.c
View file

@ -195,11 +195,12 @@ struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb,
return ERR_PTR(ret);
}
void ocfs2_commit_trans(struct ocfs2_journal_handle *handle)
void ocfs2_commit_trans(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle)
{
handle_t *jbd_handle;
int retval;
struct ocfs2_journal *journal = handle->journal;
struct ocfs2_journal *journal = osb->journal;
mlog_entry_void();

3
fs/ocfs2/journal.h
View file

@ -219,7 +219,8 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle,
int max_buffs);
void ocfs2_commit_trans(struct ocfs2_journal_handle *handle);
void ocfs2_commit_trans(struct ocfs2_super *osb,
struct ocfs2_journal_handle *handle);
int ocfs2_extend_trans(handle_t *handle, int nblocks);
/*

6
fs/ocfs2/localalloc.c
View file

@ -280,7 +280,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
mlog_errno(status);
out_commit:
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
out_unlock:
if (main_bm_bh)
@ -421,7 +421,7 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb,
if (status < 0)
mlog_errno(status);
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
out_unlock:
ocfs2_meta_unlock(main_bm_inode, 1);
@ -954,7 +954,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
status = 0;
bail:
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
if (main_bm_bh)
brelse(main_bm_bh);

10
fs/ocfs2/namei.c
View file

@ -440,7 +440,7 @@ static int ocfs2_mknod(struct inode *dir,
status = 0;
leave:
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
ocfs2_meta_unlock(dir, 1);
@ -746,7 +746,7 @@ static int ocfs2_link(struct dentry *old_dentry,
d_instantiate(dentry, inode);
out_commit:
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
out_unlock_inode:
ocfs2_meta_unlock(inode, 1);
@ -942,7 +942,7 @@ static int ocfs2_unlink(struct inode *dir,
leave:
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
if (child_locked)
ocfs2_meta_unlock(inode, 1);
@ -1428,7 +1428,7 @@ static int ocfs2_rename(struct inode *old_dir,
ocfs2_rename_unlock(osb);
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
if (parents_locked)
ocfs2_double_unlock(old_dir, new_dir);
@ -1730,7 +1730,7 @@ static int ocfs2_symlink(struct inode *dir,
d_instantiate(dentry, inode);
bail:
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
ocfs2_meta_unlock(dir, 1);

2
fs/ocfs2/suballoc.c
View file

@ -387,7 +387,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
status = 0;
bail:
if (handle)
ocfs2_commit_trans(handle);
ocfs2_commit_trans(osb, handle);
if (ac)
ocfs2_free_alloc_context(ac);