aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dir.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2009-02-13 06:24:43 -0500
committerJoel Becker <joel.becker@oracle.com>2009-09-04 19:08:09 -0400
commitcc79d8c19e9d39446525a1026f1a21761f5d3cd2 (patch)
tree3c9788c2e5ef0c51734dad8186ecd83bf4dd6584 /fs/ocfs2/dir.c
parent92ba470c44c1404ff18ca0f4ecce1e5b116bb933 (diff)
ocfs2: ocfs2_insert_extent() no longer needs struct inode.
One more function down, no inode in the entire insert-extent chain. Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/dir.c')
-rw-r--r--fs/ocfs2/dir.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 088a1b5ce9ac..de490a6d76ba 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -2591,7 +2591,6 @@ static int ocfs2_dx_dir_new_cluster(struct inode *dir,
2591{ 2591{
2592 int ret; 2592 int ret;
2593 u64 phys_blkno; 2593 u64 phys_blkno;
2594 struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
2595 2594
2596 ret = __ocfs2_dx_dir_new_cluster(dir, cpos, handle, data_ac, dx_leaves, 2595 ret = __ocfs2_dx_dir_new_cluster(dir, cpos, handle, data_ac, dx_leaves,
2597 num_dx_leaves, &phys_blkno); 2596 num_dx_leaves, &phys_blkno);
@@ -2600,7 +2599,7 @@ static int ocfs2_dx_dir_new_cluster(struct inode *dir,
2600 goto out; 2599 goto out;
2601 } 2600 }
2602 2601
2603 ret = ocfs2_insert_extent(osb, handle, dir, et, cpos, phys_blkno, 1, 0, 2602 ret = ocfs2_insert_extent(handle, et, cpos, phys_blkno, 1, 0,
2604 meta_ac); 2603 meta_ac);
2605 if (ret) 2604 if (ret)
2606 mlog_errno(ret); 2605 mlog_errno(ret);
@@ -3094,7 +3093,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
3094 * This should never fail as our extent list is empty and all 3093 * This should never fail as our extent list is empty and all
3095 * related blocks have been journaled already. 3094 * related blocks have been journaled already.
3096 */ 3095 */
3097 ret = ocfs2_insert_extent(osb, handle, dir, &et, 0, blkno, len, 3096 ret = ocfs2_insert_extent(handle, &et, 0, blkno, len,
3098 0, NULL); 3097 0, NULL);
3099 if (ret) { 3098 if (ret) {
3100 mlog_errno(ret); 3099 mlog_errno(ret);
@@ -3127,7 +3126,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
3127 dirdata_bh); 3126 dirdata_bh);
3128 } else { 3127 } else {
3129 ocfs2_init_dx_root_extent_tree(&dx_et, dir, dx_root_bh); 3128 ocfs2_init_dx_root_extent_tree(&dx_et, dir, dx_root_bh);
3130 ret = ocfs2_insert_extent(osb, handle, dir, &dx_et, 0, 3129 ret = ocfs2_insert_extent(handle, &dx_et, 0,
3131 dx_insert_blkno, 1, 0, NULL); 3130 dx_insert_blkno, 1, 0, NULL);
3132 if (ret) 3131 if (ret)
3133 mlog_errno(ret); 3132 mlog_errno(ret);
@@ -3147,7 +3146,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
3147 } 3146 }
3148 blkno = ocfs2_clusters_to_blocks(dir->i_sb, bit_off); 3147 blkno = ocfs2_clusters_to_blocks(dir->i_sb, bit_off);
3149 3148
3150 ret = ocfs2_insert_extent(osb, handle, dir, &et, 1, 3149 ret = ocfs2_insert_extent(handle, &et, 1,
3151 blkno, len, 0, NULL); 3150 blkno, len, 0, NULL);
3152 if (ret) { 3151 if (ret) {
3153 mlog_errno(ret); 3152 mlog_errno(ret);
@@ -4218,8 +4217,7 @@ static int ocfs2_expand_inline_dx_root(struct inode *dir,
4218 /* This should never fail considering we start with an empty 4217 /* This should never fail considering we start with an empty
4219 * dx_root. */ 4218 * dx_root. */
4220 ocfs2_init_dx_root_extent_tree(&et, dir, dx_root_bh); 4219 ocfs2_init_dx_root_extent_tree(&et, dir, dx_root_bh);
4221 ret = ocfs2_insert_extent(osb, handle, dir, &et, 0, 4220 ret = ocfs2_insert_extent(handle, &et, 0, insert_blkno, 1, 0, NULL);
4222 insert_blkno, 1, 0, NULL);
4223 if (ret) 4221 if (ret)
4224 mlog_errno(ret); 4222 mlog_errno(ret);
4225 did_quota = 0; 4223 did_quota = 0;