]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crush: fix weight adjust for list, tree buckets
authorSage Weil <sage@newdream.net>
Thu, 23 Feb 2012 19:03:44 +0000 (11:03 -0800)
committerSage Weil <sage@newdream.net>
Thu, 23 Feb 2012 19:39:57 +0000 (11:39 -0800)
Fix the typo.  Code now matches that for straw buckets.

Reported-by: ZhuRongze <zrz4ceph@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
src/crush/builder.c

index dcf5a8b64578695ab9d4d965ef18b1560ff644d5..c68fdf04eed2e33b0ac59fe27688c9abee8c2a0e 100644 (file)
@@ -727,7 +727,7 @@ int crush_adjust_list_bucket_item_weight(struct crush_bucket_list *bucket, int i
        if (i == bucket->h.size)
                return 0;
 
-       diff = weight = bucket->item_weights[i];
+       diff = weight - bucket->item_weights[i];
        bucket->item_weights[i] = weight;
        bucket->h.weight += diff;
 
@@ -752,7 +752,7 @@ int crush_adjust_tree_bucket_item_weight(struct crush_bucket_tree *bucket, int i
                return 0;
        
        node = crush_calc_tree_node(i);
-       diff = weight = bucket->node_weights[node];
+       diff = weight - bucket->node_weights[node];
        bucket->node_weights[node] = weight;
        bucket->h.weight += diff;