summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2014-03-19 16:58:37 +0200
committerSage Weil <sage@inktank.com>2014-04-04 21:07:25 -0700
commit6ed1002f368c63ef79d7f659fcb4368a90098132 (patch)
tree04ee2f8ea095ea791a3d99f19a28a4c064b6f720 /net/ceph
parent48a163dbb517eba13643bf404a0d695c1ab0a60d (diff)
downloadblackbird-op-linux-6ed1002f368c63ef79d7f659fcb4368a90098132.tar.gz
blackbird-op-linux-6ed1002f368c63ef79d7f659fcb4368a90098132.zip
crush: allow crush rules to set (re)tries counts to 0
These two fields are misnomers; they are *retry* counts. Reflects ceph.git commit f17caba8ae0cad7b6f8f35e53e5f73b444696835. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/crush/mapper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index 074bb2a5e675..b3fb84903b30 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -684,12 +684,12 @@ int crush_do_rule(const struct crush_map *map,
break;
case CRUSH_RULE_SET_CHOOSE_LOCAL_TRIES:
- if (curstep->arg1 > 0)
+ if (curstep->arg1 >= 0)
choose_local_retries = curstep->arg1;
break;
case CRUSH_RULE_SET_CHOOSE_LOCAL_FALLBACK_TRIES:
- if (curstep->arg1 > 0)
+ if (curstep->arg1 >= 0)
choose_local_fallback_retries = curstep->arg1;
break;
OpenPOWER on IntegriCloud