Loading fs/ocfs2/alloc.c +10 −10 Original line number Diff line number Diff line Loading @@ -1984,7 +1984,7 @@ static void ocfs2_adjust_root_records(struct ocfs2_extent_list *root_el, * - When we've adjusted the last extent record in the left path leaf and the * 1st extent record in the right path leaf during cross extent block merge. */ static void ocfs2_complete_edge_insert(struct inode *inode, handle_t *handle, static void ocfs2_complete_edge_insert(handle_t *handle, struct ocfs2_path *left_path, struct ocfs2_path *right_path, int subtree_index) Loading Loading @@ -2161,7 +2161,7 @@ static int ocfs2_rotate_subtree_right(struct inode *inode, goto out; } ocfs2_complete_edge_insert(inode, handle, left_path, right_path, ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); out: Loading Loading @@ -2772,7 +2772,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle, *deleted = 1; } else ocfs2_complete_edge_insert(inode, handle, left_path, right_path, ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); out: Loading Loading @@ -3430,8 +3430,8 @@ static int ocfs2_merge_rec_right(struct inode *inode, if (ret) mlog_errno(ret); ocfs2_complete_edge_insert(inode, handle, left_path, right_path, subtree_index); ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); } out: if (right_path) Loading Loading @@ -3629,7 +3629,7 @@ static int ocfs2_merge_rec_left(struct inode *inode, ocfs2_mv_path(right_path, left_path); left_path = NULL; } else ocfs2_complete_edge_insert(inode, handle, left_path, ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); } out: Loading Loading @@ -4195,8 +4195,8 @@ static int ocfs2_insert_path(struct inode *inode, */ subtree_index = ocfs2_find_subtree_root(inode, left_path, right_path); ocfs2_complete_edge_insert(inode, handle, left_path, right_path, subtree_index); ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); } ret = 0; Loading Loading @@ -5397,7 +5397,7 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle, int subtree_index; subtree_index = ocfs2_find_subtree_root(inode, left_path, path); ocfs2_complete_edge_insert(inode, handle, left_path, path, ocfs2_complete_edge_insert(handle, left_path, path, subtree_index); } Loading Loading
fs/ocfs2/alloc.c +10 −10 Original line number Diff line number Diff line Loading @@ -1984,7 +1984,7 @@ static void ocfs2_adjust_root_records(struct ocfs2_extent_list *root_el, * - When we've adjusted the last extent record in the left path leaf and the * 1st extent record in the right path leaf during cross extent block merge. */ static void ocfs2_complete_edge_insert(struct inode *inode, handle_t *handle, static void ocfs2_complete_edge_insert(handle_t *handle, struct ocfs2_path *left_path, struct ocfs2_path *right_path, int subtree_index) Loading Loading @@ -2161,7 +2161,7 @@ static int ocfs2_rotate_subtree_right(struct inode *inode, goto out; } ocfs2_complete_edge_insert(inode, handle, left_path, right_path, ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); out: Loading Loading @@ -2772,7 +2772,7 @@ static int ocfs2_rotate_subtree_left(struct inode *inode, handle_t *handle, *deleted = 1; } else ocfs2_complete_edge_insert(inode, handle, left_path, right_path, ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); out: Loading Loading @@ -3430,8 +3430,8 @@ static int ocfs2_merge_rec_right(struct inode *inode, if (ret) mlog_errno(ret); ocfs2_complete_edge_insert(inode, handle, left_path, right_path, subtree_index); ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); } out: if (right_path) Loading Loading @@ -3629,7 +3629,7 @@ static int ocfs2_merge_rec_left(struct inode *inode, ocfs2_mv_path(right_path, left_path); left_path = NULL; } else ocfs2_complete_edge_insert(inode, handle, left_path, ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); } out: Loading Loading @@ -4195,8 +4195,8 @@ static int ocfs2_insert_path(struct inode *inode, */ subtree_index = ocfs2_find_subtree_root(inode, left_path, right_path); ocfs2_complete_edge_insert(inode, handle, left_path, right_path, subtree_index); ocfs2_complete_edge_insert(handle, left_path, right_path, subtree_index); } ret = 0; Loading Loading @@ -5397,7 +5397,7 @@ static int ocfs2_truncate_rec(struct inode *inode, handle_t *handle, int subtree_index; subtree_index = ocfs2_find_subtree_root(inode, left_path, path); ocfs2_complete_edge_insert(inode, handle, left_path, path, ocfs2_complete_edge_insert(handle, left_path, path, subtree_index); } Loading