aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/namei.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/namei.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/namei.c')
-rw-r--r--fs/ocfs2/namei.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index daf70605afa8..9a56bfdf45c6 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -440,7 +440,7 @@ static int ocfs2_mknod(struct inode *dir,
440 status = 0; 440 status = 0;
441leave: 441leave:
442 if (handle) 442 if (handle)
443 ocfs2_commit_trans(handle); 443 ocfs2_commit_trans(osb, handle);
444 444
445 ocfs2_meta_unlock(dir, 1); 445 ocfs2_meta_unlock(dir, 1);
446 446
@@ -746,7 +746,7 @@ static int ocfs2_link(struct dentry *old_dentry,
746 d_instantiate(dentry, inode); 746 d_instantiate(dentry, inode);
747 747
748out_commit: 748out_commit:
749 ocfs2_commit_trans(handle); 749 ocfs2_commit_trans(osb, handle);
750out_unlock_inode: 750out_unlock_inode:
751 ocfs2_meta_unlock(inode, 1); 751 ocfs2_meta_unlock(inode, 1);
752 752
@@ -942,7 +942,7 @@ static int ocfs2_unlink(struct inode *dir,
942 942
943leave: 943leave:
944 if (handle) 944 if (handle)
945 ocfs2_commit_trans(handle); 945 ocfs2_commit_trans(osb, handle);
946 946
947 if (child_locked) 947 if (child_locked)
948 ocfs2_meta_unlock(inode, 1); 948 ocfs2_meta_unlock(inode, 1);
@@ -1428,7 +1428,7 @@ bail:
1428 ocfs2_rename_unlock(osb); 1428 ocfs2_rename_unlock(osb);
1429 1429
1430 if (handle) 1430 if (handle)
1431 ocfs2_commit_trans(handle); 1431 ocfs2_commit_trans(osb, handle);
1432 1432
1433 if (parents_locked) 1433 if (parents_locked)
1434 ocfs2_double_unlock(old_dir, new_dir); 1434 ocfs2_double_unlock(old_dir, new_dir);
@@ -1730,7 +1730,7 @@ static int ocfs2_symlink(struct inode *dir,
1730 d_instantiate(dentry, inode); 1730 d_instantiate(dentry, inode);
1731bail: 1731bail:
1732 if (handle) 1732 if (handle)
1733 ocfs2_commit_trans(handle); 1733 ocfs2_commit_trans(osb, handle);
1734 1734
1735 ocfs2_meta_unlock(dir, 1); 1735 ocfs2_meta_unlock(dir, 1);
1736 1736