aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/file.c
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2006-10-09 19:48:10 -0400
committerMark Fasheh <mark.fasheh@oracle.com>2006-12-01 21:28:08 -0500
commit02dc1af44e9fa4b8801169891b3a1ba4047537ad (patch)
treedb84e9ec9731dcfcf91bea226403881d0feccb49 /fs/ocfs2/file.c
parent4bcec1847ac4f75c2ee6d091b495f34d8d822e6a (diff)
ocfs2: pass ocfs2_super * into ocfs2_commit_trans()
This sets us up to remove handle->journal. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r--fs/ocfs2/file.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index bcae2693e957..9eb60f21968d 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -178,7 +178,7 @@ static int ocfs2_simple_size_update(struct inode *inode,
178 if (ret < 0) 178 if (ret < 0)
179 mlog_errno(ret); 179 mlog_errno(ret);
180 180
181 ocfs2_commit_trans(handle); 181 ocfs2_commit_trans(osb, handle);
182out: 182out:
183 return ret; 183 return ret;
184} 184}
@@ -207,7 +207,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
207 if (status < 0) 207 if (status < 0)
208 mlog_errno(status); 208 mlog_errno(status);
209 209
210 ocfs2_commit_trans(handle); 210 ocfs2_commit_trans(osb, handle);
211out: 211out:
212 mlog_exit(status); 212 mlog_exit(status);
213 return status; 213 return status;
@@ -576,7 +576,7 @@ leave:
576 drop_alloc_sem = 0; 576 drop_alloc_sem = 0;
577 } 577 }
578 if (handle) { 578 if (handle) {
579 ocfs2_commit_trans(handle); 579 ocfs2_commit_trans(osb, handle);
580 handle = NULL; 580 handle = NULL;
581 } 581 }
582 if (data_ac) { 582 if (data_ac) {
@@ -655,7 +655,7 @@ static int ocfs2_write_zero_page(struct inode *inode,
655 ret = 0; 655 ret = 0;
656 656
657 if (handle) 657 if (handle)
658 ocfs2_commit_trans(handle); 658 ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
659out_unlock: 659out_unlock:
660 unlock_page(page); 660 unlock_page(page);
661 page_cache_release(page); 661 page_cache_release(page);
@@ -850,7 +850,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
850 mlog_errno(status); 850 mlog_errno(status);
851 851
852bail_commit: 852bail_commit:
853 ocfs2_commit_trans(handle); 853 ocfs2_commit_trans(osb, handle);
854bail_unlock: 854bail_unlock:
855 ocfs2_meta_unlock(inode, 1); 855 ocfs2_meta_unlock(inode, 1);
856bail_unlock_rw: 856bail_unlock_rw:
@@ -938,7 +938,7 @@ static int ocfs2_write_remove_suid(struct inode *inode)
938out_bh: 938out_bh:
939 brelse(bh); 939 brelse(bh);
940out_trans: 940out_trans:
941 ocfs2_commit_trans(handle); 941 ocfs2_commit_trans(osb, handle);
942out: 942out:
943 mlog_exit(ret); 943 mlog_exit(ret);
944 return ret; 944 return ret;