From: Joao Eduardo Luis <joao@suse.de>
Date: Fri, 8 May 2015 18:05:00 +0000 (+0100)
Subject: mon: Monitor: add is_noforward() helper to MonCommand
X-Git-Tag: v9.0.3~21^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16df92f68dea5f84f346faca0d7f06cb213ad9fc;p=ceph.git

mon: Monitor: add is_noforward() helper to MonCommand

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 298624e6228b..9d6f1079f91b 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2611,7 +2611,7 @@ void Monitor::handle_command(MMonCommand *m)
                                               ARRAY_SIZE(mon_commands));
   if (!is_leader()) {
     if (!mon_cmd) {
-      if (leader_cmd->has_flag(MonCommand::FLAG_NOFORWARD)) {
+      if (leader_cmd->is_noforward()) {
 	reply_command(m, -EINVAL,
 		      "command not locally supported and not allowed to forward",
 		      0);
@@ -2622,7 +2622,7 @@ void Monitor::handle_command(MMonCommand *m)
       forward_request_leader(m);
       return;
     } else if (!mon_cmd->is_compat(leader_cmd)) {
-      if (mon_cmd->has_flag(MonCommand::FLAG_NOFORWARD)) {
+      if (mon_cmd->is_noforward()) {
 	reply_command(m, -EINVAL,
 		      "command not compatible with leader and not allowed to forward",
 		      0);
@@ -2642,7 +2642,7 @@ void Monitor::handle_command(MMonCommand *m)
     return;
   }
 
-  if (session->proxy_con && mon_cmd->has_flag(MonCommand::FLAG_NOFORWARD)) {
+  if (session->proxy_con && mon_cmd->is_noforward()) {
     dout(10) << "Got forward for noforward command " << m << dendl;
     reply_command(m, -EINVAL, "forward for noforward command", rdata, 0);
     return;
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 585e8f3f1bf8..879bdc00f403 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -979,6 +979,10 @@ struct MonCommand {
 	availability == o->availability;
   }
 
+  bool is_noforward() const {
+    return has_flag(MonCommand::FLAG_NOFORWARD);
+  }
+
   bool is_obsolete() const {
     return has_flag(MonCommand::FLAG_OBSOLETE);
   }