summaryrefslogtreecommitdiffstats
path: root/include/linux/ceph/osdmap.h
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2014-03-21 19:05:29 +0200
committerSage Weil <sage@inktank.com>2014-04-04 21:07:57 -0700
commit35a935d75d51abe58d3427a8b4ae3745a5a14e1c (patch)
tree0ad881fa4d6c3417e10d07cd6423751cf68e6a1f /include/linux/ceph/osdmap.h
parentec7af97258396161e6effba7e788c3fc3cb55263 (diff)
libceph: generalize ceph_pg_mapping
In preparation for adding support for primary_temp mappings, generalize struct ceph_pg_mapping so it can hold mappings other than pg_temp. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'include/linux/ceph/osdmap.h')
-rw-r--r--include/linux/ceph/osdmap.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 46c3e304c3d..4837e58e320 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -60,8 +60,13 @@ struct ceph_object_id {
struct ceph_pg_mapping {
struct rb_node node;
struct ceph_pg pgid;
- int len;
- int osds[];
+
+ union {
+ struct {
+ int len;
+ int osds[];
+ } pg_temp;
+ };
};
struct ceph_osdmap {