diff options
| author | Sage Weil <sage@inktank.com> | 2013-02-23 10:41:09 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-26 15:02:25 -0800 |
| commit | 4f6a7e5ee1393ec4b243b39dac9f36992d161540 (patch) | |
| tree | 547684ad1dc0e1e3e376e958ab74e164d6972623 /net/ceph/debugfs.c | |
| parent | ec73a754989c27628c9037887df919561280519c (diff) | |
| download | talos-obmc-linux-4f6a7e5ee1393ec4b243b39dac9f36992d161540.tar.gz talos-obmc-linux-4f6a7e5ee1393ec4b243b39dac9f36992d161540.zip | |
ceph: update support for PGID64, PGPOOL3, OSDENC protocol features
Support (and require) the PGID64, PGPOOL3, and OSDENC protocol features.
These have been present in ceph.git since v0.42, Feb 2012. Require these
features to simplify support; nobody is running older userspace.
Note that the new request and reply encoding is still not in place, so the new
code is not yet functional.
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'net/ceph/debugfs.c')
| -rw-r--r-- | net/ceph/debugfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c index 61a9af634f8b..f4d4b27d6026 100644 --- a/net/ceph/debugfs.c +++ b/net/ceph/debugfs.c @@ -66,9 +66,9 @@ static int osdmap_show(struct seq_file *s, void *p) for (n = rb_first(&client->osdc.osdmap->pg_pools); n; n = rb_next(n)) { struct ceph_pg_pool_info *pool = rb_entry(n, struct ceph_pg_pool_info, node); - seq_printf(s, "pg_pool %d pg_num %d / %d, lpg_num %d / %d\n", - pool->id, pool->v.pg_num, pool->pg_num_mask, - pool->v.lpg_num, pool->lpg_num_mask); + seq_printf(s, "pg_pool %llu pg_num %d / %d\n", + (unsigned long long)pool->id, pool->pg_num, + pool->pg_num_mask); } for (i = 0; i < client->osdc.osdmap->max_osd; i++) { struct ceph_entity_addr *addr = |
