From 0fd6e12bdd8c8a18b090cc09ce9229e24d74f550 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 29 May 2014 22:57:29 +0200 Subject: [PATCH] osd: replace shard_t usage with shard_id_t Signed-off-by: Loic Dachary --- src/os/GenericObjectMap.cc | 2 +- src/os/LFNIndex.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/os/GenericObjectMap.cc b/src/os/GenericObjectMap.cc index 0d6c029d0b9f..1e4d63a1a037 100644 --- a/src/os/GenericObjectMap.cc +++ b/src/os/GenericObjectMap.cc @@ -249,7 +249,7 @@ bool GenericObjectMap::parse_header_key(const string &long_name, return false; shardstring = string(current, end); - shard_id = (shard_t)strtoul(shardstring.c_str(), NULL, 16); + shard_id = (shard_id_t)strtoul(shardstring.c_str(), NULL, 16); } if (out) { diff --git a/src/os/LFNIndex.cc b/src/os/LFNIndex.cc index ef3945808bf9..03317f217c03 100644 --- a/src/os/LFNIndex.cc +++ b/src/os/LFNIndex.cc @@ -1060,7 +1060,7 @@ bool LFNIndex::lfn_parse_object_name(const string &long_name, ghobject_t *out) snapid_t snap; uint64_t pool; gen_t generation = ghobject_t::NO_GEN; - shard_t shard_id = ghobject_t::NO_SHARD; + shard_id_t shard_id = shard_id_t::NO_SHARD; if (index_version == HASH_INDEX_TAG) return lfn_parse_object_name_keyless(long_name, out); @@ -1137,7 +1137,7 @@ bool LFNIndex::lfn_parse_object_name(const string &long_name, ghobject_t *out) return false; shardstring = string(current, end); - shard_id = (shard_t)strtoul(shardstring.c_str(), NULL, 16); + shard_id = (shard_id_t)strtoul(shardstring.c_str(), NULL, 16); } if (snap_str == "head") -- 2.47.3