aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/alloc.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/alloc.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/alloc.c')
-rw-r--r--fs/ocfs2/alloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 22dd60833c9b..f3dbd31a85a1 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -1170,7 +1170,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
1170 if (status < 0) 1170 if (status < 0)
1171 mlog_errno(status); 1171 mlog_errno(status);
1172 1172
1173 ocfs2_commit_trans(handle); 1173 ocfs2_commit_trans(osb, handle);
1174 1174
1175out_unlock: 1175out_unlock:
1176 brelse(data_alloc_bh); 1176 brelse(data_alloc_bh);
@@ -1379,7 +1379,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
1379 1379
1380 status = ocfs2_truncate_log_append(osb, handle, 1380 status = ocfs2_truncate_log_append(osb, handle,
1381 start_blk, clusters); 1381 start_blk, clusters);
1382 ocfs2_commit_trans(handle); 1382 ocfs2_commit_trans(osb, handle);
1383 if (status < 0) { 1383 if (status < 0) {
1384 mlog_errno(status); 1384 mlog_errno(status);
1385 goto bail_up; 1385 goto bail_up;
@@ -1883,7 +1883,7 @@ start:
1883 mutex_unlock(&tl_inode->i_mutex); 1883 mutex_unlock(&tl_inode->i_mutex);
1884 tl_sem = 0; 1884 tl_sem = 0;
1885 1885
1886 ocfs2_commit_trans(handle); 1886 ocfs2_commit_trans(osb, handle);
1887 handle = NULL; 1887 handle = NULL;
1888 1888
1889 BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters); 1889 BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters);
@@ -1898,7 +1898,7 @@ bail:
1898 mutex_unlock(&tl_inode->i_mutex); 1898 mutex_unlock(&tl_inode->i_mutex);
1899 1899
1900 if (handle) 1900 if (handle)
1901 ocfs2_commit_trans(handle); 1901 ocfs2_commit_trans(osb, handle);
1902 1902
1903 if (last_eb_bh) 1903 if (last_eb_bh)
1904 brelse(last_eb_bh); 1904 brelse(last_eb_bh);