Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 165087
b: refs/heads/master
c: 3505bec
h: refs/heads/master
i:
  165085: b773e13
  165083: 14f912d
  165079: 192327f
  165071: ff75919
  165055: f507255
v: v3
  • Loading branch information
Joel Becker committed Sep 4, 2009
1 parent 92ad810 commit f04bdf2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c38e52bb1c0187186bd3c4a2b318ffe69cd2fdf8
refs/heads/master: 3505bec01829a8f690259517add55c7941a4d3d5
14 changes: 6 additions & 8 deletions trunk/fs/ocfs2/alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4108,8 +4108,7 @@ static void ocfs2_split_record(struct ocfs2_extent_tree *et,
* in. left_path should only be passed in if we need to update that
* portion of the tree after an edge insert.
*/
static int ocfs2_insert_path(struct inode *inode,
handle_t *handle,
static int ocfs2_insert_path(handle_t *handle,
struct ocfs2_extent_tree *et,
struct ocfs2_path *left_path,
struct ocfs2_path *right_path,
Expand Down Expand Up @@ -4198,8 +4197,7 @@ static int ocfs2_insert_path(struct inode *inode,
return ret;
}

static int ocfs2_do_insert_extent(struct inode *inode,
handle_t *handle,
static int ocfs2_do_insert_extent(handle_t *handle,
struct ocfs2_extent_tree *et,
struct ocfs2_extent_rec *insert_rec,
struct ocfs2_insert_type *type)
Expand Down Expand Up @@ -4290,7 +4288,7 @@ static int ocfs2_do_insert_extent(struct inode *inode,
}
}

ret = ocfs2_insert_path(inode, handle, et, left_path, right_path,
ret = ocfs2_insert_path(handle, et, left_path, right_path,
insert_rec, type);
if (ret) {
mlog_errno(ret);
Expand Down Expand Up @@ -4718,7 +4716,7 @@ int ocfs2_insert_extent(struct ocfs2_super *osb,
}

/* Finally, we can add clusters. This might rotate the tree for us. */
status = ocfs2_do_insert_extent(inode, handle, et, &rec, &insert);
status = ocfs2_do_insert_extent(handle, et, &rec, &insert);
if (status < 0)
mlog_errno(status);
else if (et->et_ops == &ocfs2_dinode_et_ops)
Expand Down Expand Up @@ -4933,7 +4931,7 @@ static int ocfs2_split_and_insert(struct inode *inode,
do_leftright = 1;
}

ret = ocfs2_do_insert_extent(inode, handle, et, &split_rec, &insert);
ret = ocfs2_do_insert_extent(handle, et, &split_rec, &insert);
if (ret) {
mlog_errno(ret);
goto out;
Expand Down Expand Up @@ -5237,7 +5235,7 @@ static int ocfs2_split_tree(struct inode *inode, struct ocfs2_extent_tree *et,
insert.ins_split = SPLIT_RIGHT;
insert.ins_tree_depth = depth;

ret = ocfs2_do_insert_extent(inode, handle, et, &split_rec, &insert);
ret = ocfs2_do_insert_extent(handle, et, &split_rec, &insert);
if (ret)
mlog_errno(ret);

Expand Down

0 comments on commit f04bdf2

Please sign in to comment.