From 9606232bb916533c8398e15a26b9855e618866ae Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Tue, 9 Sep 2014 17:48:46 +0800 Subject: [PATCH] KeyValueStore: Fix scrub causing inconsistence state Fix #8589 Backport #Firefly Signed-off-by: Haomai Wang --- src/os/GenericObjectMap.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/os/GenericObjectMap.cc b/src/os/GenericObjectMap.cc index 4412a9102c83..00387ad666d6 100644 --- a/src/os/GenericObjectMap.cc +++ b/src/os/GenericObjectMap.cc @@ -121,10 +121,7 @@ string GenericObjectMap::header_key(const coll_t &cid, const ghobject_t &oid) full_name.append(GHOBJECT_KEY_SEP_S); t = buf; - if (oid.hobj.pool == -1) - t += snprintf(t, end - t, "none"); - else - t += snprintf(t, end - t, "%llx", (long long unsigned)oid.hobj.pool); + t += snprintf(t, end - t, "%lld", (long long)oid.hobj.pool); full_name += string(buf); full_name.append(GHOBJECT_KEY_SEP_S); -- 2.47.3