summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-29 16:59:06 +0100
committerSage Weil <sage@inktank.com>2013-10-29 16:59:06 +0100
commit2181b4c94696432814fea828a7efa54586b324a4 (patch)
treed78c03b2cdb468731a87e5657f6f49b254fba3a1
parentReplicatedPG::recover_backfill: update last_backfill to max() when backfill i... (diff)
downloadceph-2181b4c94696432814fea828a7efa54586b324a4.tar.xz
ceph-2181b4c94696432814fea828a7efa54586b324a4.zip
mon/OSDMonitor: fix signedness warning on poolid
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/mon/OSDMonitor.cc2
-rw-r--r--src/mon/OSDMonitor.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9af7b223667..d56953ba069 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4340,7 +4340,7 @@ int OSDMonitor::_prepare_remove_pool(uint64_t pool)
return 0;
}
-int OSDMonitor::_prepare_rename_pool(uint64_t pool, string newname)
+int OSDMonitor::_prepare_rename_pool(int64_t pool, string newname)
{
dout(10) << "_prepare_rename_pool " << pool << dendl;
if (pending_inc.old_pools.count(pool)) {
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 439c8435055..25a2061a8eb 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -227,7 +227,7 @@ private:
bool prepare_pgtemp(class MOSDPGTemp *m);
int _prepare_remove_pool(uint64_t pool);
- int _prepare_rename_pool(uint64_t pool, string newname);
+ int _prepare_rename_pool(int64_t pool, string newname);
bool preprocess_pool_op ( class MPoolOp *m);
bool preprocess_pool_op_create ( class MPoolOp *m);