X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fcrush%2FCrushCompiler.cc;h=e01d089acbcf2e2c6e0a714abbf0c182ddc37fbd;hb=224ce89bce8186937e77bdbda572a650953f8c23;hp=a6b62456699ff7b97fd1fca2b9fde492f2b8bfec;hpb=06dae762bfef1ba116dc58483c7b68b733d853e0;p=ceph.git diff --git a/ceph/src/crush/CrushCompiler.cc b/ceph/src/crush/CrushCompiler.cc index a6b624566..e01d089ac 100644 --- a/ceph/src/crush/CrushCompiler.cc +++ b/ceph/src/crush/CrushCompiler.cc @@ -232,7 +232,7 @@ int CrushCompiler::decompile_weight_set(crush_weight_set *weight_set, return 0; } -int CrushCompiler::decompile_ids(int *ids, +int CrushCompiler::decompile_ids(__s32 *ids, __u32 size, ostream &out) { @@ -972,7 +972,7 @@ int CrushCompiler::parse_choose_arg_ids(iter_t const& i, int bucket_id, crush_ch return -1; } arg->ids_size = size; - arg->ids = (int *)calloc(arg->ids_size, sizeof(int)); + arg->ids = (__s32 *)calloc(arg->ids_size, sizeof(__s32)); __u32 pos = 0; for (iter_t p = i->children.begin() + 2; pos < size; p++, pos++) arg->ids[pos] = int_node(*p);