From: Sage Weil <sage@inktank.com>
Date: Wed, 6 Feb 2013 00:35:55 +0000 (-0800)
Subject: mon: move list_rules into CrushWrapper method
X-Git-Tag: v0.58~141^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b635423bda16030cfe7593ecc85edeb79736200;p=ceph.git

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 349773f6d271..209bb982d860 100644
--- 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);