Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing

2013-01-30 07:54:34 -06:00
parent 949db153b6 1ec3911dbd
commit 969e5aa3b0
14 changed files with 647 additions and 606 deletions
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
@@ -162,6 +162,8 @@ struct crush_map {
 	__u32 choose_local_fallback_tries;
 	/* choose attempts before giving up */ 
 	__u32 choose_total_tries;
+	/* attempt chooseleaf inner descent once; on failure retry outer descent */
+	__u32 chooseleaf_descend_once;
 };