RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2034 from ceph/wip-osd-ints

Browse Source 
osd: fix int -> int32_t in misc encoded structures

Reviewed-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2014-06-26 11:05:49 -07:00
commit 4aadddc30b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osd/osd_types.h
View File

@ -69,7 +69,7 @@ const char *ceph_osd_flag_name(unsigned flag);
string ceph_osd_flag_string(unsigned flags);
struct pg_shard_t {
int osd;
int32_t osd;
shard_id_t shard;
pg_shard_t() : osd(-1), shard(shard_id_t::NO_SHARD) {}
explicit pg_shard_t(int osd) : osd(osd), shard(shard_id_t::NO_SHARD) {}
@ -1340,8 +1340,8 @@ struct pg_stat_t {
bool hitset_stats_invalid;
/// up, acting primaries
int up_primary;
int acting_primary;
int32_t up_primary;
int32_t acting_primary;
pg_stat_t()
: reported_seq(0),
@ -1691,11 +1691,11 @@ ostream &operator<<(ostream &lhs, const pg_notify_t &notify);
*/
class OSDMap;
struct pg_interval_t {
vector<int> up, acting;
vector<int32_t> up, acting;
epoch_t first, last;
bool maybe_went_rw;
int primary;
int up_primary;
int32_t primary;
int32_t up_primary;
pg_interval_t()
: first(0), last(0),