diff options
| author | Alex Elder <elder@inktank.com> | 2013-01-30 08:54:34 -0500 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2013-01-30 08:54:34 -0500 |
| commit | 969e5aa3b0162a02c4f287d48ff58ca2145acf1b (patch) | |
| tree | 1af8e8e47e7352c6d3b4abfdb4aea6bd9458666f /include/linux/ceph/osdmap.h | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | 1ec3911dbd19076bcdfe5540096ff67f91a6ec02 (diff) | |
Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing
Diffstat (limited to 'include/linux/ceph/osdmap.h')
| -rw-r--r-- | include/linux/ceph/osdmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h index 10a417f9f76f..c83a838f89f5 100644 --- a/include/linux/ceph/osdmap.h +++ b/include/linux/ceph/osdmap.h | |||
| @@ -110,7 +110,7 @@ extern void ceph_osdmap_destroy(struct ceph_osdmap *map); | |||
| 110 | 110 | ||
| 111 | /* calculate mapping of a file extent to an object */ | 111 | /* calculate mapping of a file extent to an object */ |
| 112 | extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout, | 112 | extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout, |
| 113 | u64 off, u64 *plen, | 113 | u64 off, u64 len, |
| 114 | u64 *bno, u64 *oxoff, u64 *oxlen); | 114 | u64 *bno, u64 *oxoff, u64 *oxlen); |
| 115 | 115 | ||
| 116 | /* calculate mapping of object to a placement group */ | 116 | /* calculate mapping of object to a placement group */ |