diff options
author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-03-21 13:05:29 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2014-04-05 00:07:57 -0400 |
commit | 35a935d75d51abe58d3427a8b4ae3745a5a14e1c (patch) | |
tree | 0ad881fa4d6c3417e10d07cd6423751cf68e6a1f /include/linux/ceph/osdmap.h | |
parent | ec7af97258396161e6effba7e788c3fc3cb55263 (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.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h index 46c3e304c3d8..4837e58e3203 100644 --- a/include/linux/ceph/osdmap.h +++ b/include/linux/ceph/osdmap.h | |||
@@ -60,8 +60,13 @@ struct ceph_object_id { | |||
60 | struct ceph_pg_mapping { | 60 | struct ceph_pg_mapping { |
61 | struct rb_node node; | 61 | struct rb_node node; |
62 | struct ceph_pg pgid; | 62 | struct ceph_pg pgid; |
63 | int len; | 63 | |
64 | int osds[]; | 64 | union { |
65 | struct { | ||
66 | int len; | ||
67 | int osds[]; | ||
68 | } pg_temp; | ||
69 | }; | ||
65 | }; | 70 | }; |
66 | 71 | ||
67 | struct ceph_osdmap { | 72 | struct ceph_osdmap { |