commit 6ed1002f368c63ef79d7f659fcb4368a90098132
author Ilya Dryomov <ilya.dryomov@inktank.com> Wed Mar 19 16:58:37 2014 +0200
committer Sage Weil <sage@inktank.com> Fri Apr 04 21:07:25 2014 -0700
tree 04ee2f8ea095ea791a3d99f19a28a4c064b6f720
parent 48a163dbb517eba13643bf404a0d695c1ab0a60d

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>

net/ceph/crush/mapper.c

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index 074bb2a..b3fb849 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -684,12 +684,12 @@
 			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;