Commit bd6b0bf8 authored by Roel Kluin's avatar Roel Kluin Committed by Joel Becker

ocfs2: Fix contiguousness check in ocfs2_try_to_merge_extent_map()

The wrong member was compared in the continguousness check.
Acked-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent cda70ba8
...@@ -192,7 +192,7 @@ static int ocfs2_try_to_merge_extent_map(struct ocfs2_extent_map_item *emi, ...@@ -192,7 +192,7 @@ static int ocfs2_try_to_merge_extent_map(struct ocfs2_extent_map_item *emi,
emi->ei_clusters += ins->ei_clusters; emi->ei_clusters += ins->ei_clusters;
return 1; return 1;
} else if ((ins->ei_phys + ins->ei_clusters) == emi->ei_phys && } else if ((ins->ei_phys + ins->ei_clusters) == emi->ei_phys &&
(ins->ei_cpos + ins->ei_clusters) == emi->ei_phys && (ins->ei_cpos + ins->ei_clusters) == emi->ei_cpos &&
ins->ei_flags == emi->ei_flags) { ins->ei_flags == emi->ei_flags) {
emi->ei_phys = ins->ei_phys; emi->ei_phys = ins->ei_phys;
emi->ei_cpos = ins->ei_cpos; emi->ei_cpos = ins->ei_cpos;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment