osdmon: remove default values for prepare_new_pool

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index fa7141cf0fc7337f3c8a1a70c2e1a0c057718f41..2bf5474159c9122d7ea6cace17ad7a525c8508bb 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1726,7 +1726,8 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
        }
       }
       else if (m->cmd[2] == "create" && m->cmd.size() >= 4) {
-        int ret = prepare_new_pool(m->cmd[3]);
+        int ret = prepare_new_pool(m->cmd[3], CEPH_AUTH_UID_DEFAULT, -1);
+        // that's the default auid owner (ie, none) and the default crush rule
         if (ret < 0) {
           if (ret == -EEXIST)
             ss << "pool '" << m->cmd[3] << "' exists";

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index f76d1e361ff98fb78d7a8a154e964e685ec6261d..0cb88bbc18de10aad7c199f595f100db0b2f5b43 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -97,8 +97,7 @@ private:
   bool prepare_pool_op_create (MPoolOp *m);
   bool prepare_pool_op_delete(MPoolOp *m);
   bool prepare_pool_op_auid(MPoolOp *m);
-  int prepare_new_pool(string& name, uint64_t auid = CEPH_AUTH_UID_DEFAULT,
-                      int crush_rule = -1);
+  int prepare_new_pool(string& name, uint64_t auid, int crush_rule);
   int prepare_new_pool(MPoolOp *m);
 
   void _pool_op_reply(MPoolOp *m, int ret, epoch_t epoch, bufferlist *blp=NULL);