diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ocfs2/alloc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index bac6ca024768..2c4967f7b667 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
@@ -3623,15 +3623,13 @@ out: | |||
3623 | return ret; | 3623 | return ret; |
3624 | } | 3624 | } |
3625 | 3625 | ||
3626 | static int ocfs2_try_to_merge_extent(struct inode *inode, | 3626 | static int ocfs2_try_to_merge_extent(handle_t *handle, |
3627 | handle_t *handle, | 3627 | struct ocfs2_extent_tree *et, |
3628 | struct ocfs2_path *path, | 3628 | struct ocfs2_path *path, |
3629 | int split_index, | 3629 | int split_index, |
3630 | struct ocfs2_extent_rec *split_rec, | 3630 | struct ocfs2_extent_rec *split_rec, |
3631 | struct ocfs2_cached_dealloc_ctxt *dealloc, | 3631 | struct ocfs2_cached_dealloc_ctxt *dealloc, |
3632 | struct ocfs2_merge_ctxt *ctxt, | 3632 | struct ocfs2_merge_ctxt *ctxt) |
3633 | struct ocfs2_extent_tree *et) | ||
3634 | |||
3635 | { | 3633 | { |
3636 | int ret = 0; | 3634 | int ret = 0; |
3637 | struct ocfs2_extent_list *el = path_leaf_el(path); | 3635 | struct ocfs2_extent_list *el = path_leaf_el(path); |
@@ -5069,9 +5067,9 @@ static int __ocfs2_mark_extent_written(struct inode *inode, | |||
5069 | if (ret) | 5067 | if (ret) |
5070 | mlog_errno(ret); | 5068 | mlog_errno(ret); |
5071 | } else { | 5069 | } else { |
5072 | ret = ocfs2_try_to_merge_extent(inode, handle, path, | 5070 | ret = ocfs2_try_to_merge_extent(handle, et, path, |
5073 | split_index, split_rec, | 5071 | split_index, split_rec, |
5074 | dealloc, &ctxt, et); | 5072 | dealloc, &ctxt); |
5075 | if (ret) | 5073 | if (ret) |
5076 | mlog_errno(ret); | 5074 | mlog_errno(ret); |
5077 | } | 5075 | } |