Skip to content

Commit

Permalink
ocfs2: ocfs2_try_to_merge_extent() doesn't need struct inode.
Browse files Browse the repository at this point in the history
It's not using it, so remove it from the parameter list.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
  • Loading branch information
Joel Becker committed Sep 4, 2009
1 parent 4fe82c3 commit c495dd2
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions fs/ocfs2/alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3623,15 +3623,13 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path,
return ret;
}

static int ocfs2_try_to_merge_extent(struct inode *inode,
handle_t *handle,
static int ocfs2_try_to_merge_extent(handle_t *handle,
struct ocfs2_extent_tree *et,
struct ocfs2_path *path,
int split_index,
struct ocfs2_extent_rec *split_rec,
struct ocfs2_cached_dealloc_ctxt *dealloc,
struct ocfs2_merge_ctxt *ctxt,
struct ocfs2_extent_tree *et)

struct ocfs2_merge_ctxt *ctxt)
{
int ret = 0;
struct ocfs2_extent_list *el = path_leaf_el(path);
Expand Down Expand Up @@ -5069,9 +5067,9 @@ static int __ocfs2_mark_extent_written(struct inode *inode,
if (ret)
mlog_errno(ret);
} else {
ret = ocfs2_try_to_merge_extent(inode, handle, path,
ret = ocfs2_try_to_merge_extent(handle, et, path,
split_index, split_rec,
dealloc, &ctxt, et);
dealloc, &ctxt);
if (ret)
mlog_errno(ret);
}
Expand Down

0 comments on commit c495dd2

Please sign in to comment.