]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crush: fix type mismatch 17214/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 15 Aug 2017 04:18:30 +0000 (12:18 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 24 Aug 2017 02:01:31 +0000 (10:01 +0800)
Pool IDs are of type int64_t instead of uint64_t.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 507f970b569280831ec9d12df8455227e9a31f36)

src/crush/CrushWrapper.cc

index 985c426b7c30264aec64d8bfc6dfea20cbb21ebd..c0c64935c84d55e87b83a03039d4b9cb845ff491 100644 (file)
@@ -2305,7 +2305,7 @@ void CrushWrapper::decode(bufferlist::iterator& blp)
       __u32 choose_args_size;
       ::decode(choose_args_size, blp);
       for (__u32 i = 0; i < choose_args_size; i++) {
-       uint64_t choose_args_index;
+        typename decltype(choose_args)::key_type choose_args_index;
        ::decode(choose_args_index, blp);
        crush_choose_arg_map arg_map;
        arg_map.size = crush->max_buckets;