diff options
| author | Sage Weil <sage@newdream.net> | 2009-11-04 11:39:12 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2009-11-04 16:36:07 -0800 |
| commit | 51042122d4f85e0f8ee577a4230f172fcc57c456 (patch) | |
| tree | d5ccf5f84d362b6542a86eab6b6f50112111434b /fs/ceph/ioctl.c | |
| parent | 63f2d211954b790fea0a9caeae605c7956535af6 (diff) | |
| download | talos-obmc-linux-51042122d4f85e0f8ee577a4230f172fcc57c456.tar.gz talos-obmc-linux-51042122d4f85e0f8ee577a4230f172fcc57c456.zip | |
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/ioctl.c')
| -rw-r--r-- | fs/ceph/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c index e4f99eff5d93..4c33e19fc241 100644 --- a/fs/ceph/ioctl.c +++ b/fs/ceph/ioctl.c @@ -99,7 +99,7 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg) u64 len = 1, olen; u64 tmp; struct ceph_object_layout ol; - union ceph_pg pgid; + struct ceph_pg pgid; /* copy and validate */ if (copy_from_user(&dl, arg, sizeof(dl))) @@ -121,7 +121,7 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg) ceph_calc_object_layout(&ol, dl.object_name, &ci->i_layout, osdc->osdmap); - pgid.pg64 = le64_to_cpu(ol.ol_pgid); + pgid = ol.ol_pgid; dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid); if (dl.osd >= 0) { struct ceph_entity_addr *a = |
