Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing

This commit is contained in:
Alex Elder
2013-01-30 07:54:34 -06:00
14 changed files with 647 additions and 606 deletions
+1 -1
View File
@@ -110,7 +110,7 @@ extern void ceph_osdmap_destroy(struct ceph_osdmap *map);
/* calculate mapping of a file extent to an object */
extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
u64 off, u64 *plen,
u64 off, u64 len,
u64 *bno, u64 *oxoff, u64 *oxlen);
/* calculate mapping of object to a placement group */