aboutsummaryrefslogtreecommitdiff
path: root/fs/ceph/osdmap.h
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-11-04 11:39:12 -0800
committerSage Weil <sage@newdream.net>2009-11-04 16:36:07 -0800
commit51042122d4f85e0f8ee577a4230f172fcc57c456 (patch)
treed5ccf5f84d362b6542a86eab6b6f50112111434b /fs/ceph/osdmap.h
parent63f2d211954b790fea0a9caeae605c7956535af6 (diff)
ceph: fix endian conversions for ceph_pg
The endian conversions don't quite work with the old union ceph_pg. Just make it a regular struct, and make each field __le. This is simpler and it has the added bonus of actually working. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/osdmap.h')
-rw-r--r--fs/ceph/osdmap.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ceph/osdmap.h b/fs/ceph/osdmap.h
index 07127c6fb13..c4af8418aa0 100644
--- a/fs/ceph/osdmap.h
+++ b/fs/ceph/osdmap.h
@@ -25,7 +25,7 @@ struct ceph_pg_pool_info {
struct ceph_pg_mapping {
struct rb_node node;
- u64 pgid;
+ struct ceph_pg pgid;
int len;
int osds[];
};
@@ -118,6 +118,7 @@ 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_primary(struct ceph_osdmap *osdmap, union ceph_pg pgid);
+extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,
+ struct ceph_pg pgid);
#endif