From 6fb499f15558400dbc847afaa284294a551e8db5 Mon Sep 17 00:00:00 2001 From: huanwen ren Date: Sun, 12 Jun 2016 17:56:14 +0800 Subject: [PATCH] mds/tools: fix mds->mdsmap->get_metadata_pool() return int->int64_t mds->mdsmap->get_metadata_pool() return should be int64_t not int, fix up Signed-off-by: huanwen ren --- src/tools/cephfs/DataScan.cc | 4 ++-- src/tools/cephfs/JournalTool.cc | 2 +- src/tools/cephfs/Resetter.cc | 4 ++-- src/tools/cephfs/TableTool.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/cephfs/DataScan.cc b/src/tools/cephfs/DataScan.cc index bb0584a365da3..46c71f9194663 100644 --- a/src/tools/cephfs/DataScan.cc +++ b/src/tools/cephfs/DataScan.cc @@ -278,7 +278,7 @@ int DataScan::main(const std::vector &args) std::cerr << "Filesystem id " << fscid << " does not exist" << std::endl; return -ENOENT; } - int const metadata_pool_id = fs->mds_map.get_metadata_pool(); + int64_t const metadata_pool_id = fs->mds_map.get_metadata_pool(); dout(4) << "resolving metadata pool " << metadata_pool_id << dendl; std::string metadata_pool_name; @@ -1576,7 +1576,7 @@ int MetadataDriver::init( { auto fs = fsmap->get_filesystem(fscid); assert(fs != nullptr); - int const metadata_pool_id = fs->mds_map.get_metadata_pool(); + int64_t const metadata_pool_id = fs->mds_map.get_metadata_pool(); dout(4) << "resolving metadata pool " << metadata_pool_id << dendl; std::string metadata_pool_name; diff --git a/src/tools/cephfs/JournalTool.cc b/src/tools/cephfs/JournalTool.cc index 63e5ac1108955..679d840d1c066 100644 --- a/src/tools/cephfs/JournalTool.cc +++ b/src/tools/cephfs/JournalTool.cc @@ -116,7 +116,7 @@ int JournalTool::main(std::vector &argv) auto fs = fsmap->get_filesystem(role_selector.get_ns()); assert(fs != nullptr); - int const pool_id = fs->mds_map.get_metadata_pool(); + int64_t const pool_id = fs->mds_map.get_metadata_pool(); dout(4) << "JournalTool: resolving pool " << pool_id << dendl; std::string pool_name; r = rados.pool_reverse_lookup(pool_id, &pool_name); diff --git a/src/tools/cephfs/Resetter.cc b/src/tools/cephfs/Resetter.cc index f1102f35a483b..1154a294b50b0 100644 --- a/src/tools/cephfs/Resetter.cc +++ b/src/tools/cephfs/Resetter.cc @@ -34,7 +34,7 @@ int Resetter::reset(mds_role_t role) auto fs = fsmap->get_filesystem(role.fscid); assert(fs != nullptr); - int const pool_id = fs->mds_map.get_metadata_pool(); + int64_t const pool_id = fs->mds_map.get_metadata_pool(); JournalPointer jp(role.rank, pool_id); int jp_load_result = jp.load(objecter); @@ -117,7 +117,7 @@ int Resetter::reset_hard(mds_role_t role) { auto fs = fsmap->get_filesystem(role.fscid); assert(fs != nullptr); - int const pool_id = fs->mds_map.get_metadata_pool(); + int64_t const pool_id = fs->mds_map.get_metadata_pool(); JournalPointer jp(role.rank, pool_id); jp.front = role.rank + MDS_INO_LOG_OFFSET; diff --git a/src/tools/cephfs/TableTool.cc b/src/tools/cephfs/TableTool.cc index 2ff020a6de671..4970c4b4c6a34 100644 --- a/src/tools/cephfs/TableTool.cc +++ b/src/tools/cephfs/TableTool.cc @@ -332,7 +332,7 @@ int TableTool::main(std::vector &argv) auto fs = fsmap->get_filesystem(role_selector.get_ns()); assert(fs != nullptr); - int const pool_id = fs->mds_map.get_metadata_pool(); + int64_t const pool_id = fs->mds_map.get_metadata_pool(); dout(4) << "resolving pool " << pool_id << dendl; std::string pool_name; r = rados.pool_reverse_lookup(pool_id, &pool_name); -- 2.39.5