mon: move list_rules into CrushWrapper method

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 349773f6d271a7823e6bb220e9900736e329d07d..209bb982d860b6cbe6c12c57d85483bef6b7f148 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2000,11 +2000,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
                                                                                   m->cmd[3] == "ls")) {
       JSONFormatter jf(true);
       jf.open_array_section("rules");
-      for (int rule = 0; rule < osdmap.crush->get_max_rules(); rule++) {
-       if (!osdmap.crush->rule_exists(rule))
-         continue;
-       jf.dump_string("name", osdmap.crush->get_rule_name(rule));
-      }
+      osdmap.crush->list_rules(&jf);
       jf.close_section();
       ostringstream rs;
       jf.flush(rs);