2 files changed, 6 insertions, 3 deletions

diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h
index 158a4d25ca83..7c4750811b96 100644
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
@@ -166,4 +166,9 @@ extern void crush_destroy_bucket_straw(struct crush_bucket_straw *b);
 extern void crush_destroy_bucket(struct crush_bucket *b);
 extern void crush_destroy(struct crush_map *map);
 
+static inline int crush_calc_tree_node(int i)
+{
+        return ((i+1) << 1)-1;
+}
+
 #endif
diff --git a/net/ceph/crush/crush.c b/net/ceph/crush/crush.c
index 2160791acf03..b93575f4eb13 100644
--- a/net/ceph/crush/crush.c
+++ b/net/ceph/crush/crush.c
@@ -37,9 +37,7 @@ int crush_get_bucket_item_weight(const struct crush_bucket *b, int p)
         case CRUSH_BUCKET_LIST:
                 return ((struct crush_bucket_list *)b)->item_weights[p];
         case CRUSH_BUCKET_TREE:
-                if (p & 1)
-                        return ((struct crush_bucket_tree *)b)->node_weights[p];
-                return 0;
+                return ((struct crush_bucket_tree *)b)->node_weights[crush_calc_tree_node(p)];
         case CRUSH_BUCKET_STRAW:
                 return ((struct crush_bucket_straw *)b)->item_weights[p];
         }