[Ocfs2-devel] ocfs2: ei_cpos/phys confusion?

[Roel Kluin]

in ocfs2_try_to_merge_extent_map(), vi fs/ocfs2/extent_map.c +185

        if (ins->ei_phys == (emi->ei_phys + emi->ei_clusters) &&
            ins->ei_cpos == (emi->ei_cpos + emi->ei_clusters) &&
            ins->ei_flags == emi->ei_flags) {
                emi->ei_clusters += ins->ei_clusters;
                return 1;
        } else if ((ins->ei_phys + ins->ei_clusters) == emi->ei_phys &&
                   (ins->ei_cpos + ins->ei_clusters) == emi->ei_phys &&
----------------------------------------------------------------^^^^
                   ins->ei_flags == emi->ei_flags) {
                emi->ei_phys = ins->ei_phys;
                emi->ei_cpos = ins->ei_cpos;
                emi->ei_clusters += ins->ei_clusters;
                return 1;
        }

should that 2nd emi->ei_phys be emi->ei_cpos?

Roel