Ocfs2 devel - Jan 2010 - ocfs2: ei_cpos/phys confusion?

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

Hi Roel,

Roel Kluin wrote:
> 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?
oh, yes, you are right. Do you want to provide a patch?

Regards,
Tao
> 
> Roel
> 
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-devel