From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 23 Sep 2015 09:52:27 +0000 (+0200)
Subject: mon/PGMonitor.cc: assign result directly
X-Git-Tag: v10.0.4~86^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dddc21b5ddf93dcbdaebbb01b860c7bf1355ef46;p=ceph.git

mon/PGMonitor.cc: assign result directly

Fix for:

[src/mon/PGMonitor.cc:1514] -> [src/mon/PGMonitor.cc:1515]: (performance)
 Variable 'pool' is reassigned a value before the old one has been used.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index f9c61b7e9c27..98ffb8b58038 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1604,8 +1604,7 @@ bool PGMonitor::preprocess_command(MonOpRequestRef op)
     prefix = "pg ls";
     string poolstr;
     cmd_getval(g_ceph_context, cmdmap, "poolstr", poolstr);
-    int64_t pool = -2;
-    pool = mon->osdmon()->osdmap.lookup_pg_pool_name(poolstr.c_str());
+    int64_t pool = mon->osdmon()->osdmap.lookup_pg_pool_name(poolstr.c_str());
     if (pool < 0) {
       r = -ENOENT;
       ss << "pool " << poolstr << " does not exist";