From: Sage Weil <sage@inktank.com>
Date: Thu, 31 Oct 2013 16:49:09 +0000 (-0700)
Subject: mon/OSDMonitor: refix warning
X-Git-Tag: v0.73~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4032501eb60dd9de290113c04fa7daad272b96f9;p=ceph.git

mon/OSDMonitor: refix warning

mon/OSDMonitor.cc: In member function 'int OSDMonitor::_prepare_rename_pool(int64_t, std::string)':
mon/OSDMonitor.cc:4370:55: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

Two fixes for this crossed paths in
0c186096bb9534165394046fd8dd914e1be44094 and
2181b4c94696432814fea828a7efa54586b324a4

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c46fa5215d4f..6c4eff5fffba 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4367,7 +4367,7 @@ int OSDMonitor::_prepare_rename_pool(int64_t pool, string newname)
   for (map<int64_t,string>::iterator p = pending_inc.new_pool_names.begin();
        p != pending_inc.new_pool_names.end();
        ++p) {
-    if (p->second == newname && (uint64_t)p->first != pool) {
+    if (p->second == newname && p->first != pool) {
       return -EEXIST;
     }
   }