aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/inode.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/inode.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/inode.c')
-rw-r--r--fs/ocfs2/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index dec0ece6267a..7708c63a3554 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -538,7 +538,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
538 goto bail; 538 goto bail;
539 } 539 }
540 540
541 ocfs2_commit_trans(handle); 541 ocfs2_commit_trans(osb, handle);
542 handle = NULL; 542 handle = NULL;
543 543
544 status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc); 544 status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc);
@@ -554,7 +554,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
554 } 554 }
555bail: 555bail:
556 if (handle) 556 if (handle)
557 ocfs2_commit_trans(handle); 557 ocfs2_commit_trans(osb, handle);
558 558
559 mlog_exit(status); 559 mlog_exit(status);
560 return status; 560 return status;
@@ -629,7 +629,7 @@ static int ocfs2_remove_inode(struct inode *inode,
629 mlog_errno(status); 629 mlog_errno(status);
630 630
631bail_commit: 631bail_commit:
632 ocfs2_commit_trans(handle); 632 ocfs2_commit_trans(osb, handle);
633bail_unlock: 633bail_unlock:
634 ocfs2_meta_unlock(inode_alloc_inode, 1); 634 ocfs2_meta_unlock(inode_alloc_inode, 1);
635 mutex_unlock(&inode_alloc_inode->i_mutex); 635 mutex_unlock(&inode_alloc_inode->i_mutex);