| From 7e2c188f5aa5a008bace69a30260eceac7873d95 Mon Sep 17 00:00:00 2001 |
| From: Sage Weil <sage@inktank.com> |
| Date: Mon, 7 May 2012 15:36:49 -0700 |
| Subject: crush: fix tree node weight lookup |
| |
| From: Sage Weil <sage@inktank.com> |
| |
| (cherry picked from commit f671d4cd9b36691ac4ef42cde44c1b7a84e13631) |
| |
| Fix the node weight lookup for tree buckets by using a correct accessor. |
| |
| Reflects ceph.git commit d287ade5bcbdca82a3aef145b92924cf1e856733. |
| |
| Reviewed-by: Alex Elder <elder@inktank.com> |
| Signed-off-by: Sage Weil <sage@inktank.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| include/linux/crush/crush.h | 5 +++++ |
| net/ceph/crush/crush.c | 4 +--- |
| 2 files changed, 6 insertions(+), 3 deletions(-) |
| |
| --- a/include/linux/crush/crush.h |
| +++ b/include/linux/crush/crush.h |
| @@ -177,4 +177,9 @@ extern void crush_destroy_bucket_straw(s |
| 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 |
| --- a/net/ceph/crush/crush.c |
| +++ b/net/ceph/crush/crush.c |
| @@ -37,9 +37,7 @@ int crush_get_bucket_item_weight(const s |
| 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]; |
| } |
