@@ -2598,11 +2598,8 @@ static void ocfs2_unlink_subtree(handle_t *handle,
2598
2598
int i ;
2599
2599
struct buffer_head * root_bh = left_path -> p_node [subtree_index ].bh ;
2600
2600
struct ocfs2_extent_list * root_el = left_path -> p_node [subtree_index ].el ;
2601
- struct ocfs2_extent_list * el ;
2602
2601
struct ocfs2_extent_block * eb ;
2603
2602
2604
- el = path_leaf_el (left_path );
2605
-
2606
2603
eb = (struct ocfs2_extent_block * )right_path -> p_node [subtree_index + 1 ].bh -> b_data ;
2607
2604
2608
2605
for (i = 1 ; i < le16_to_cpu (root_el -> l_next_free_rec ); i ++ )
@@ -3938,7 +3935,7 @@ static void ocfs2_adjust_rightmost_records(handle_t *handle,
3938
3935
struct ocfs2_path * path ,
3939
3936
struct ocfs2_extent_rec * insert_rec )
3940
3937
{
3941
- int ret , i , next_free ;
3938
+ int i , next_free ;
3942
3939
struct buffer_head * bh ;
3943
3940
struct ocfs2_extent_list * el ;
3944
3941
struct ocfs2_extent_rec * rec ;
@@ -3955,7 +3952,6 @@ static void ocfs2_adjust_rightmost_records(handle_t *handle,
3955
3952
ocfs2_error (ocfs2_metadata_cache_get_super (et -> et_ci ),
3956
3953
"Owner %llu has a bad extent list\n" ,
3957
3954
(unsigned long long )ocfs2_metadata_cache_owner (et -> et_ci ));
3958
- ret = - EIO ;
3959
3955
return ;
3960
3956
}
3961
3957
@@ -5057,7 +5053,6 @@ int ocfs2_split_extent(handle_t *handle,
5057
5053
struct buffer_head * last_eb_bh = NULL ;
5058
5054
struct ocfs2_extent_rec * rec = & el -> l_recs [split_index ];
5059
5055
struct ocfs2_merge_ctxt ctxt ;
5060
- struct ocfs2_extent_list * rightmost_el ;
5061
5056
5062
5057
if (le32_to_cpu (rec -> e_cpos ) > le32_to_cpu (split_rec -> e_cpos ) ||
5063
5058
((le32_to_cpu (rec -> e_cpos ) + le16_to_cpu (rec -> e_leaf_clusters )) <
@@ -5093,9 +5088,7 @@ int ocfs2_split_extent(handle_t *handle,
5093
5088
}
5094
5089
5095
5090
eb = (struct ocfs2_extent_block * ) last_eb_bh -> b_data ;
5096
- rightmost_el = & eb -> h_list ;
5097
- } else
5098
- rightmost_el = path_root_el (path );
5091
+ }
5099
5092
5100
5093
if (rec -> e_cpos == split_rec -> e_cpos &&
5101
5094
rec -> e_leaf_clusters == split_rec -> e_leaf_clusters )
0 commit comments