openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ocfs2: ocfs2_try_to_merge_extent() doesn't need struct inode. 

It's not using it, so remove it from the parameter list.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
This commit is contained in:
Joel Becker 2009-02-13 02:19:11 -08:00
parent 4fe82c312a
commit c495dd24ac
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/ocfs2/alloc.c
View File

@ -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);
@ -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);
}