---

yaml --- r: 373454 b: refs/heads/master c: a84cd29 h: refs/heads/master v: v3
git-mirror · May 2, 2013 · 47cceb5 · 47cceb5
1 parent 9ca8e14
commit 47cceb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b3e1a56982d0eafff0afb0ff9e87c8b944a9bdc
+refs/heads/master: a84cd29335f4ca38ca8405c1636ee3876bb292b5
diff --git a/trunk/fs/ceph/mdsmap.c b/trunk/fs/ceph/mdsmap.c
@@ -20,7 +20,10 @@ int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m)
 {
 	int n = 0;
 	int i;
-	char r;
+
+	/* special case for one mds */
+	if (1 == m->m_max_mds && m->m_info[0].state > 0)
+		return 0;
 
 	/* count */
 	for (i = 0; i < m->m_max_mds; i++)
@@ -30,8 +33,7 @@ int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m)
 		return -1;
 
 	/* pick */
-	get_random_bytes(&r, 1);
-	n = r % n;
+	n = prandom_u32() % n;
 	i = 0;
 	for (i = 0; n > 0; i++, n--)
 		while (m->m_info[i].state <= 0)