From b53bd6084e0c2e73a4b5efcff6d162b672e8bcfb Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Sat, 5 Sep 2015 13:58:01 +0200
Subject: [PATCH] ceph_objectstore_tool.cc: change ghobject_t::NO_SHARD to
 shard_id_t::NO_SHARD

This commit extends the changes from dedd8e2 to
src/tools/ceph_objectstore_tool.cc, which was backported to firefly
(after dedd8e2) by https://github.com/ceph/ceph/pull/3866

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---
 src/tools/ceph_objectstore_tool.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 306a9f05a46361..0789d56eb314ee 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -195,7 +195,7 @@ struct pg_begin {
     if (struct_v > 2) {
       ::decode(pgid.shard, bl);
     } else {
-      pgid.shard = ghobject_t::NO_SHARD;
+      pgid.shard = shard_id_t::NO_SHARD;
     }
     DECODE_FINISH(bl);
   }
@@ -230,7 +230,7 @@ struct object_begin {
       ::decode(hoid.shard_id, bl);
     } else {
       hoid.generation = ghobject_t::NO_GEN;
-      hoid.shard_id = ghobject_t::NO_SHARD;
+      hoid.shard_id = shard_id_t::NO_SHARD;
     }
     if (struct_v > 2) {
       ::decode(oi, bl);