Skip to content

Commit

Permalink
ceph_objectstore_tool.cc: change ghobject_t::NO_SHARD to shard_id_t::…
Browse files Browse the repository at this point in the history
…NO_SHARD

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
  • Loading branch information
smithfarm committed Oct 8, 2015
1 parent 90dbd77 commit b53bd60
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/tools/ceph_objectstore_tool.cc
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b53bd60

Please sign in to comment.