summaryrefslogtreecommitdiff
path: root/include/linux/ceph/osdmap.h
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-01-08 09:15:10 -0800
committerSage Weil <sage@inktank.com>2013-02-26 15:01:41 -0800
commit12979354a1d6ef25d86f381e4d5f9e103f29913a (patch)
tree95a435f9a3d64fbb4a48244db4e1fc7ebce00426 /include/linux/ceph/osdmap.h
parentc47f9371545abe2510ac3b66c3fc180921816f65 (diff)
libceph: rename ceph_pg -> ceph_pg_v1
Rename the old version this type to distinguish it from the new version. Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'include/linux/ceph/osdmap.h')
-rw-r--r--include/linux/ceph/osdmap.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index c83a838f89f5..eb4989aa48e8 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -28,7 +28,7 @@ struct ceph_pg_pool_info {
struct ceph_pg_mapping {
struct rb_node node;
- struct ceph_pg pgid;
+ struct ceph_pg_v1 pgid;
int len;
int osds[];
};
@@ -118,10 +118,11 @@ extern int ceph_calc_object_layout(struct ceph_object_layout *ol,
const char *oid,
struct ceph_file_layout *fl,
struct ceph_osdmap *osdmap);
-extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
+extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap,
+ struct ceph_pg_v1 pgid,
int *acting);
extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,
- struct ceph_pg pgid);
+ struct ceph_pg_v1 pgid);
extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id);
extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name);