From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Tue, 2 Aug 2011 20:11:31 +0000 (-0700)
Subject: osdmon: always send in the CRUSH rule.
X-Git-Tag: v0.34~104^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=309d1579979bb8e8d319c251301eba80a18f7341;p=ceph.git

osdmon: always send in the CRUSH rule.

Not sure why this wasn't there before...looks like the CRUSH option
is newer than the code and it didn't all get updated.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 848e5caa1a1f..fa7141cf0fc7 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1343,7 +1343,7 @@ int OSDMonitor::prepare_new_pool(MPoolOp *m)
   if (!session)
     return -EPERM;
   if (m->auid)
-    return prepare_new_pool(m->name, m->auid);
+    return prepare_new_pool(m->name, m->auid, m->crush_rule);
   else
     return prepare_new_pool(m->name, session->caps.auid, m->crush_rule);
 }